be smarter about punctuation when joining

[fixes #1]
Merge pull request #21 from alxndr/1-punctuation

be smarter about punctuation when joining