Client mods
Merge branch 'master' of github.com:matula/cgc