added server socket again
Merge pull request #8 from jrahm/master

added server socket again