Merge branch 'release-0.4'
updates readme
Merge branch 'master' into integration