Fix #14
Merge pull request #15 from jonross/iss14

 Fix #14