Encode URI : closes #1 #2