merging some changes
Merge pull request #10 from alexanderson/fix-client

merging some changes