moved after server initialize code
Merge pull request #107 from jstrimpel/master

moved after server initialize code