Merge pull request #43 from netmanagers/master

Proxy support & linting