Develop

Fixes #21 Closes #21