Added proxy support
Merge branch 'master' of github.com:csauve/shanty