Merge branch 'release/0.3.1' into develop
Supports cache
Update version
Merge branch 'release/0.4.0'