fixed version check and added more test cases
Merge branch 'master' into dev
Finish version-0.3.1