Develop

Fixes issue #125