Develop

Resolves #3