Rewrote the regex parse query, small update in the readme.