Close GH-2: Updated the regex to match ANSI spec..