getting ready for composer
Merge branch 'master' into 0.1