Merge pull request #2 from aaronhaines/master

Disambiguate paths with different numbers of variable parts
Handle simple query string parameters