Added composer.json
Merge branch 'master' into composer
Changed due to testing