Fixed Issue #33

Fixes #33 .