Merge branch 'hotfix/0.3.2'
error handling when parsing config
Merge branch 'hotfix/0.3.3' into develop