Develop

Fixes for issue #129