Merge branch 'hotfix/0.1.1a'
Update comments
Merge branch 'hotfix/0.1.2' into develop