Fix proxy client bugs
Merge pull request #69 from mirrorcoder/temp

Fix proxy client bugs