Fix #10
Merge pull request #11 from jonross/iss10

Fix #10