Merge pull request #30 from xando/master

pyflakes: client.py:18: redefinition of unused 'socket' from line 4
Simple working RFC #17