Develop

Fixes #13