0.4.0.1

Merge request for #186 and #190