Fixed #18

Fixes issue #18