Merge pull request #197 from saxonmatt/master