Simplify the comparators
Merge pull request #61 from swentel/DEV

Simplify the comparators