Feature/issue 2

Fixes #2