Updates for 0.4.0 release
Resolve merge conflicts