Merge pull request #40 from jgilme1/newPatternStyle

New pattern style
Fix extra spaces around hyphens (and other tokens)
Merge pull request #41 from rbart/fixhyphens

Fix extra spaces around hyphens (and other tokens)
Merge branch 'master' into newPatternStyle