Update CHANGELOG for PR #49
Fix infite loop in server name generator