Better error handling
Update version
Merge branch 'release/0.3.3' into develop