Update WordCount Regular Expression (second attempt)

After more time to consideration, I think this regular expression is better.

[edited title by tito]