Issue/#26

Fixes #26