diff --git a/src/PermissionManager.cpp b/src/PermissionManager.cpp
index efc0796..4440316 100644
--- a/src/PermissionManager.cpp
+++ b/src/PermissionManager.cpp
@@ -86,6 +86,7 @@ deque<std::shared_ptr<PermissionTypeEntry>> ts::permission::availablePermissions
         make_shared<PermissionTypeEntry>(PermissionType::b_virtualserver_modify_min_client_version, PermissionGroup::vs_settings, "b_virtualserver_modify_min_client_version", "Modify min client version"),
         make_shared<PermissionTypeEntry>(PermissionType::b_virtualserver_modify_icon_id, PermissionGroup::vs_settings, "b_virtualserver_modify_icon_id", "Modify server icon"),
         make_shared<PermissionTypeEntry>(PermissionType::b_virtualserver_modify_weblist, PermissionGroup::vs_settings, "b_virtualserver_modify_weblist", "Modify web server list reporting settings"),
+        make_shared<PermissionTypeEntry>(PermissionType::b_virtualserver_modify_country_code, PermissionGroup::vs_settings, "b_virtualserver_modify_country_code", "Modify servers country code property"),
         make_shared<PermissionTypeEntry>(PermissionType::b_virtualserver_modify_codec_encryption_mode, PermissionGroup::vs_settings, "b_virtualserver_modify_codec_encryption_mode", "Modify codec encryption mode"),
         make_shared<PermissionTypeEntry>(PermissionType::b_virtualserver_modify_temporary_passwords, PermissionGroup::vs_settings, "b_virtualserver_modify_temporary_passwords", "Modify temporary serverpasswords"),
         make_shared<PermissionTypeEntry>(PermissionType::b_virtualserver_modify_temporary_passwords_own, PermissionGroup::vs_settings, "b_virtualserver_modify_temporary_passwords_own", "Modify own temporary serverpasswords"),
@@ -544,6 +545,7 @@ i_group_modify_power,
         i_ft_quota_mb_upload_per_client,
         i_ft_quota_mb_download_per_client,
         b_virtualserver_modify_weblist,
+        b_virtualserver_modify_country_code,
         b_virtualserver_channelgroup_delete,
         b_virtualserver_servergroup_delete,
         b_client_ban_delete,
diff --git a/src/PermissionManager.h b/src/PermissionManager.h
index 7834c1d..9510c1d 100644
--- a/src/PermissionManager.h
+++ b/src/PermissionManager.h
@@ -130,6 +130,7 @@ namespace ts {
             b_virtualserver_modify_min_client_version,
             b_virtualserver_modify_icon_id,
             b_virtualserver_modify_weblist,
+		    b_virtualserver_modify_country_code,
             b_virtualserver_modify_codec_encryption_mode,
             b_virtualserver_modify_temporary_passwords,
             b_virtualserver_modify_temporary_passwords_own,
diff --git a/src/Properties.cpp b/src/Properties.cpp
index 73a8184..25aa317 100644
--- a/src/Properties.cpp
+++ b/src/Properties.cpp
@@ -233,7 +233,8 @@ namespace ts {
 
 				make_shared<PropertyDescription>(VIRTUALSERVER_MUSIC_BOT_LIMIT, "VIRTUALSERVER_MUSIC_BOT_LIMIT", "-1", TYPE_SIGNED_NUMBER, FLAG_SERVER_VARIABLE | FLAG_NEW | FLAG_SS | FLAG_USER_EDITABLE),                           //only available on request (=> requestServerVariables)
 				make_shared<PropertyDescription>(VIRTUALSERVER_SPOKEN_TIME, "VIRTUALSERVER_SPOKEN_TIME", "0", TYPE_UNSIGNED_NUMBER, FLAG_INTERNAL | FLAG_NEW | FLAG_SAVE),                           //only available on request (=> requestServerVariables)
-				make_shared<PropertyDescription>(VIRTUALSERVER_DISABLE_IP_SAVING, "VIRTUALSERVER_DISABLE_IP_SAVING", "0", TYPE_BOOL, FLAG_INTERNAL | FLAG_NEW | FLAG_SAVE | FLAG_USER_EDITABLE)                           //only available on request (=> requestServerVariables)
+				make_shared<PropertyDescription>(VIRTUALSERVER_DISABLE_IP_SAVING, "VIRTUALSERVER_DISABLE_IP_SAVING", "0", TYPE_BOOL, FLAG_INTERNAL | FLAG_NEW | FLAG_SAVE | FLAG_USER_EDITABLE),                           //only available on request (=> requestServerVariables)
+				make_shared<PropertyDescription>(VIRTUALSERVER_COUNTRY_CODE, "VIRTUALSERVER_COUNTRY_CODE", "XX", TYPE_STRING, FLAG_SERVER_VV | FLAG_SAVE | FLAG_USER_EDITABLE)                           //available when connected
 		};
 
 		array<shared_ptr<PropertyDescription>, ChannelProperties::CHANNEL_ENDMARKER> channel_info = {
diff --git a/src/Properties.h b/src/Properties.h
index b3da1f4..1ddcfe4 100644
--- a/src/Properties.h
+++ b/src/Properties.h
@@ -219,6 +219,8 @@ namespace ts {
 		    VIRTUALSERVER_SPOKEN_TIME,
 		    VIRTUALSERVER_DISABLE_IP_SAVING,
 
+		    VIRTUALSERVER_COUNTRY_CODE,
+
 		    VIRTUALSERVER_ENDMARKER
 	    };
 
diff --git a/src/protocol/ringbuffer.h b/src/protocol/ringbuffer.h
index 52da63f..7a1f643 100644
--- a/src/protocol/ringbuffer.h
+++ b/src/protocol/ringbuffer.h
@@ -119,7 +119,7 @@ namespace ts {
 						this->_ring_index = index;
 					else if(index < 100 && this->_ring_index > std::numeric_limits<size_type>::max() - 100) {
 						this->_ring_index_full += 200; /* let the index overflow into the generation counter */
-						this->_ring_index = index; /* set the lover (16) bytes */
+						this->_ring_index = index; /* set the lower (16) bytes */
 					}
 				}