Issue/#19

Fixes #19