Issue/#36

Fixes #36