Issue/#13

Fixes #13