Updated for 1.6
Added proxy's
Merge remote-tracking branch 'refs/remotes/origin/master' into dev
Merge pull request #4 from Patcraft/dev

Dev merge