commas, etc
Merge pull request #196 from lindbrook/patch-24

commas, etc