Merge branch 'hotfix/0.5.1'
Merge branch 'master' into develop
Bumped version to 1.0.0
Merge branch 'release/1.0.0' into develop