Client modifications
Merge pull request #6 from nkigen/temp_branch

Client modifications