Merge branch 'master' into dev
bumped version
Merge branch 'release/0.4'