v0.4

Manually merged branches