Merge branch 'release/0.5' into develop
Version 1.0
Merge branch 'release/1.0'