Quick fixes for custom servernames
[0.7.4.2] Fix for ServerName setting
merged updates from master
#36 related