Fix for issue-594.  Replace URI.create() with UriBuilder which is more lenient with input that needs escaping.
Merge pull request #595 from twbecker/issue594

Proposed fix for issue 594.