changes to composer
Merge branch 'heads/1.0.1-dev'