Merge pull request #64 from EvanDotPro/hotfix/composer-fixes