Feature/issue 111

Fixes #111