Resolved #18, extending server name available