Merge branch 'release/0.4.0' into develop
Add map
Update version
Merge branch 'release/0.5.0'