Merge branch 'hotfix-0.1.1'
Hotfix #48, bumped version number to 0.1.2
Merge branch 'hotfix-0.1.2' into develop