Develop

Fixes #63