Merge pull request #2 from purple52/master

Fix escaping and quote characters