bumped version no
Merge branch 'release-0.4'
Merge branch 'master' into develop