removed direct dependency to urllib
fixed merge