Merge branch 'hotfix/0.1.2'
Update comments and fix some error messages
Merge branch 'hotfix/0.1.3' into develop