fixed/improved the Regex part, see #7