Merge pull request #38 from csmith/master

Quotes are good.
Fix some more broken quotes
Merge pull request #39 from greboid/master

Fix some more broken quotes