Add comparison methods to fix issue #24.
Merge branch 'develop' into 'master'.