Issue/#11

Fixes #11