Merge pull request #1 from techdivision/master

Get changes from zelgerj ...
Bugfixg for invalid URI usage instead of PathInfo
Merge pull request #8 from wagnert/master

Bugfixg for invalid URI usage instead of PathInfo