Issue #9

Fixes issue #9