Fix for #85
Merge branch '0.4.1'