Merge branch 'develop'
Fixed composer.json
Merge remote-tracking branch 'origin/master' into develop
composer.json file bumped
1.0.4