Develop

Fixes for #175