client changes
Merge pull request #1 from veryrobert/gh-clientchanges

client changes