First commit in develop
Merge branch 'release/version_1.0'