Fixed clienthandler. Should be done.
Merge origin/master