Tweaked Regex to fix Issue #25.