Added a version of the client that should work with python 2