Adding parsing of query strings.
Merge remote-tracking branch 'origin/master'