Merge branch 'hotfix-0.1.1'
fixed version numbering
Merge branch 'hotfix-0.1.2' into develop