Merge "Bug Fix: Using library for urlencode"