Convention fix
Composer
Merge branch 'bugFix'
Merge pull request #8 from ZZromanZZ/master

Experimental support for composer