New regular expression to fix some cases.
Check version after parsing.
More test cases.
Merge branch 'new-regex': new regular expression.

* new-regex:
  More test cases.
  Check version after parsing.
  New regular expression to fix some cases.