Jmrunge/issue23

Fixes #23