Fix #34.
Merge pull request #35 from zuck/fix-issue-34

Fixed #34.