Problem: server and client don't identify themselves
Merge pull request #12 from lucteo/master

Problem: server and client don't identify themselves