Merge pull request #1 from wooorm/master

Improve performance
Add additional quote characters
2.0.0