Merge branch 'hotfix/0.6.1'
Merge branch 'release/1.0.0'
Updated CHANGELOG
Bumped VERSION to 1.0.1
Merge branch 'hotfix/1.0.1' into develop