Merge pull request #63 from mirrorcoder/master

Refactoring struct data
Proxy class for client