Merge branch 'hotfix/0.4.1' into develop
include all errors in one namespace
Merge branch 'release/0.4.2'