m4rc1e Merge pull request #5 from Fonthausen/lig-fix