Tim/issue209

Fixes #209