Merge pull request #1 from marcqualie/master

Slight changes to Client