Issue/#7

Fixes #7