Fix #8
Merge pull request #9 from jonross/iss8

Fix #8