typofix
Merge branch 'composer-support'