fixed memory leaks in client
Merge branch 'working_branch'