Merge branch 'hotfix/version_match'
Merge branch 'release/1.0.1'
fix version (again)
Merge branch 'hotfix/version_mismatch' into develop