Issue/#15

Fixes #15