Develop

Fixes issue #121 .