Fix #35
Merge pull request #36 from pwaller/issue-35

Fix #35