Merge pull request #249 from skrenek/master

URI encoding and filtering fixes.