Merge branch 'release/0.3.0' into develop
+ 0.4.0   adds assets
Merge branch 'release/0.4.0'