Fix issue #1
Merge pull request #2 from pwaller/issue-1

Fix issue #1