Issue 244

Fixes for #244