clean multi-server support
Merge pull request #7 from nopedial/master

clean multi-server support