Merge pull request #7 from jrahm/master

Merge
added server socket again