Update for URL Encoding and test cases - Now Version 1.2