Updated for latest github version and added proxy support