Fixes #1
Merge branch 'develop'
Merge remote-tracking branch 'origin/master'
Added version to composer.jsin.
Merge branch 'develop'