Merge branch 'release/0.4'
Merge tag '0.4' into develop

tagging 0.4