Begin fixing #1, not yet working though
Fix double quote issue - fixes #1
Merge branch 'double_quotes'