waiting for master changes
Merge branch 'master' into test
modified listen() to return current server instance
adapted tests
Merge pull request #7 from Kreees/test

Return serverHandler