Index: /TrunK/L2J2010_CORE/config/other.properties
===================================================================
--- /TrunK/L2J2010_CORE/config/other.properties (revision 462)
+++ /TrunK/L2J2010_CORE/config/other.properties (revision 474)
@@ -142,4 +142,8 @@
 # Auto list GMs in GM list (/gmlist) on login.
 GMStartupAutoList = True
+# Show the GM's name behind an announcement made by him  
+# Example: "Announce: hi [Leviathan]" 
+GMShowAnnouncerName = False 
+
 # The way //admin panel looks can be "modern" or "classic" 
 # (default is modern while classic provides more compatibility) 
Index: /TrunK/L2J2010_CORE/java/com/it/br/Config.java
===================================================================
--- /TrunK/L2J2010_CORE/java/com/it/br/Config.java (revision 469)
+++ /TrunK/L2J2010_CORE/java/com/it/br/Config.java (revision 473)
@@ -1122,4 +1122,5 @@
     public static boolean GM_STARTUP_INVISIBLE;
     public static boolean GM_STARTUP_SILENCE;
+    public static boolean GM_ANNOUNCER_NAME;
     public static boolean GM_STARTUP_AUTO_LIST;
     public static String  GM_ADMIN_MENU_STYLE;
@@ -1787,4 +1788,5 @@
                 GM_STARTUP_AUTO_LIST  = Boolean.parseBoolean(otherSettings.getProperty("GMStartupAutoList", "True"));
                 GM_ADMIN_MENU_STYLE   = otherSettings.getProperty("GMAdminMenuStyle", "modern");
+          		GM_ANNOUNCER_NAME = Boolean.parseBoolean(otherSettings.getProperty("GMShowAnnouncerName", "False"));
                 PETITIONING_ALLOWED      = Boolean.parseBoolean(otherSettings.getProperty("PetitioningAllowed", "True"));
                 MAX_PETITIONS_PER_PLAYER = Integer.parseInt(otherSettings.getProperty("MaxPetitionsPerPlayer", "5"));
Index: /TrunK/L2J2010_CORE/java/com/it/br/gameserver/handler/admincommandhandlers/AdminAnnouncements.java
===================================================================
--- /TrunK/L2J2010_CORE/java/com/it/br/gameserver/handler/admincommandhandlers/AdminAnnouncements.java (revision 325)
+++ /TrunK/L2J2010_CORE/java/com/it/br/gameserver/handler/admincommandhandlers/AdminAnnouncements.java (revision 473)
@@ -64,6 +64,9 @@
 		else if (command.startsWith("admin_announce_menu"))
 		{
-			Announcements sys = new Announcements();
-			sys.handleAnnounce(command, 20);
+		if (Config.GM_ANNOUNCER_NAME)
+				{
+			command += " [" + activeChar.getName() + "]";
+				}
+			Announcements.getInstance().handleAnnounce(command, 20);
 			Announcements.getInstance().listAnnouncements(activeChar);
 		}
@@ -103,7 +106,9 @@
 		else if (command.startsWith("admin_announce"))
 		{
-			// Call method from another class
-			Announcements sys = new Announcements();
-			sys.handleAnnounce(command, 15);
+		if (Config.GM_ANNOUNCER_NAME)
+		{
+				command += " [" + activeChar.getName() + "]";
+					}
+	    		Announcements.getInstance().handleAnnounce(command, 15);
 		}
 
Index: /TrunK/L2J2010_CORE/java/com/it/br/gameserver/GameServer.java
===================================================================
--- /TrunK/L2J2010_CORE/java/com/it/br/gameserver/GameServer.java (revision 445)
+++ /TrunK/L2J2010_CORE/java/com/it/br/gameserver/GameServer.java (revision 473)
@@ -232,4 +232,5 @@
 	public GameServer() throws Exception
 	{
+		long serverLoadStart = System.currentTimeMillis();
         gameServer = this;
 
@@ -546,5 +547,7 @@
 		_selectorThread.openServerSocket();
 		_selectorThread.start();
-		_log.config("Numero maximo de players: " + Config.MAXIMUM_ONLINE_USERS);
+		_log.config("Maximum Numbers of Connected Players: " + Config.MAXIMUM_ONLINE_USERS);
+		long serverLoadEnd = System.currentTimeMillis();
+		_log.info("Server Loaded in " + ((serverLoadEnd - serverLoadStart) / 1000) + " seconds");
 	}