Fix issue 334, adding urlquote functionality

I've added test for issue reproducing and simple solution for this issue. Please review.