Alexander Khalyapov, 395, Proxy

Sorry for being late - 've forgotten to upload all files...
Alexander Khalyapov, 395, Proxy

Fixed build issue
Alexander Khalyapov, 395, Proxy

Fixed cs issue
Alexander Khalyapov, 395, Proxy

Fixed another CS issue
Merge pull request #573 from khalyapov/Proxy

Alexander Khalyapov, 395, Proxy