Merge branch 'release/0.1.1'
fix some comments
Bumped version number to 0.1.2
Merge branch 'hotfix/0.1.2' into develop