Fixed a few potential bugs in the schematron
Merge remote-tracking branch 'origin/master'