Jmrunge/#22

Fixes #22