Fix URL encoding problem, fix #10