Issue #37

Fixes #37