progress on composer
Merge branch 'master' of github.com:peter-mw/test