Merge branch 'master' into develop
Updated the changelog v1.0
Merge branch 'release-1.0'