Merge branch 'hotfix/0.1.1'
Rename exception classes
Merge branch 'hotfix/0.1.2' into develop