Updated build configuration
Fixed URLEncoding usage
Fixes #716
Fixes #690
Merge commit '85ffc37b1e1477930a5dc9ca5b0407dc92d09969'