Develop

Fixes for #5