improved Version parsing