Fixed merge issue.
Merge branch 'master' of https://github.com/jayway/JsonPath
Fixed issues.