Merge branch 'hotfix/0.1.4'
Fix a typo in the view generator
Merge branch 'hotfix/0.1.5' into develop