Develop

Fixes issue #13