Issue/#21

Fixes #21