Merge pull request #25 from galstrom21/master

still working on getting the escaping right