Fixing client to match our decisions
Merge branch 'master' of https://github.com/alvinlao/charm