modify regex to remove trailing punctuation.
Merge remote-tracking branch 'origin/master'