Adding some client logic
Merge branch 'master' of https://github.com/mr-nuno/tellstick
merging