Fixing bugs introduced with last push *sigh*
Merge pull request #148 from saxonmatt/master

Fixing bugs introduced to OctoTools in last push *sigh*