Refactor some methods, add test for string escapes
Merge pull request #14 from bjz/parser-rewrite

Refactor some methods, add test for string escapes