Refactoring
Merge pull request #3 from piotrrepetowski/Proxy

Refactoring