Fix #6.
Merge pull request #7 from jonross/iss6

Fix #6.