0.4.0 development

Fixes #5