Merge and bump

Merging in master, bumping to 0.4.0