Fix matching of space around punctuation
Merge branch 'spaced_punctuation' into remino