Feature/issue 3

Fixes #3