Merge pull request #228 from DOCGroup/jwillemsen-patch-1