0.4.1
Merge branch '0.4.x'