Fixed Issue #33
Merge pull request #35 from gideonthomas/issue33

Fixed Issue #33