Fixed issue #33.
Merge pull request #36 from WrinklyNinja/issue-33

Issue 33