Improve quotation marks

Fixes issues #30 and #31