improved the code for proxy feature
Merge pull request #24 from qivhou/master

Improved the code for proxy feature