Merge branch 'release/0.4.0'
Merge tag '0.4.0' into development

Tagging version 0.4.0 0.4.0