Merge branch develop

Fixes #10