Added a setting to handle the + issue mentioned in #32, and the percent encoding test from the issue.