changes to allow for @ in the passwords of proxies

The only change(which makes a (BIG) difference) is on the line 140.