Version bump to 0.4.0
Merge Master to Production on version v0.4.0