Refactor gtr (greater than range) code. Catch some cases where it was returning an incorrect result.
Merge remote-tracking branch 'origin/master'