Fix #12
Merge pull request #13 from jonross/iss12

Fix #12