Pull of v0.4.0 into master