Changed regex to fix handling of newlines within comments. This fixes #17.
Skip spacing before punctuation, fixes #15.