Merge pull request #135 from jwillemsen/jwi-typos