Merge branch 'release/v0.4'
Merge tag 'v0.4' into develop

releasing v0.4