Develop

Resolves issue #22