0.4.1 fix #19
Merge branch '0.4'