refactor client to conform to its base class behavior
Merge branch 'image' of http://github.com/sw00/cloudcafe into image