Issues/151 url encoding

#151 
I merged into ``1.0.x`` from ``master``.