Simplifying spaceless regexes for avoiding overlaps

Fixes #211
CHANGELOG updated