bump version for release
bump version for next release
Merge branch 'release/0.4'
merge master to develop