Update to version 0.4.0
Resolve merge conflicts