Return serverHandler

Fixes #6