Fix for long server names
Merge pull request #13 from paimpozhil/master

Fix for long server names