CS and minor fixes
improved comparison
Merge pull request #76 from liuggio/master

Fixing `version is flawed #75`