Merge branch 'release/3.1.1'
Merge tag '3.1.1' into develop

Use CGI.escape ratehr than URI.escape to resolve #59