fixed client issues
Merge branch 'master' of https://github.com/dieselpoint/rhubarb.git