Client -2 more work
Merge pull request #2 from aabes/client-2-more-work

Client -2 more work