Merge branch 'hotfix/0.0.0.4'
showing feedback on error
Merge branch 'hotfix/0.0.0.5' into develop