Adding simple proxy
Merge branch 'AddingProxy'