Tweaking regex, fixing issues, update readme