0.4.0 release
merging 0.4.0 release