Issue/#23

Fixes #23