Simplified the version-regexp