Merge branch 'release/1.0.0'
Version now same as git label
Merge branch 'hotfix/1.0.1' into develop