FIx errors
Update version
Merge branch 'release/0.4.1' into develop