Merge pull request #1 from joewiz/master

updating my current fork
redid 99f3271 and incremented group count
Merge pull request #10 from peterstadler/master

fixing for saxon, part 2