Issues/#39

Fixes #39