diff --git a/resources/lang-packages/lang_br.yml b/resources/lang-packages/lang_br.yml
index 3b27d96..a5303d5 100644
--- a/resources/lang-packages/lang_br.yml
+++ b/resources/lang-packages/lang_br.yml
@@ -124,7 +124,7 @@ teams:
       usage: "Uso da opção register: /uhc teams register <nomeDoTime>"
     setmaxsize:
       notice: "Argumentos invalidos para a opção setMaxSize no comando /uhc teams <opção>!"
-      usage: "Uso da opção setMaxSize: /uhc teams setMaxSize <nomeDoTime> <numero>"
+      usage: "Uso da opção setMaxSize: /uhc teams setMaxSize <nomeDoTime> <numero> ou /uhc teams setMaxSize <numero>"
     nosuchoption: "Nenhuma opção disponivel para o comando /uhc teams <opção>!"
     availableoptions: "Opções disponiveis são: register, add, kick, delete, setMaxSize."
 
diff --git a/resources/lang-packages/lang_ca.yml b/resources/lang-packages/lang_ca.yml
index af4568f..58193d3 100644
--- a/resources/lang-packages/lang_ca.yml
+++ b/resources/lang-packages/lang_ca.yml
@@ -124,7 +124,7 @@ teams:
       usage: "Ús de l'opció eliminar: /uhc teams register <nom de l'equip>"
     setmaxsize:
       notice: "Arguments invàlids per a l'opció establirMidaMàxima del comandament /uhc teams <opció>!"
-      usage: "Ús de l'opció establirMidaMàxima: /uhc teams setMaxSize <nom de l'equip> <número>"
+      usage: "Ús de l'opció establirMidaMàxima: /uhc teams setMaxSize <nom de l'equip> <número> o /uhc teams setMaxSize <número>"
     nosuchoption: "No hi ha aquesta opció disponible per al comandament /uhc teams <opció>!"
     availableoptions: "Les opcions disponibles són: register, add, kick, delete, setMaxSize."
 
diff --git a/resources/lang-packages/lang_en.yml b/resources/lang-packages/lang_en.yml
index 8074f7d..b62258f 100644
--- a/resources/lang-packages/lang_en.yml
+++ b/resources/lang-packages/lang_en.yml
@@ -124,7 +124,7 @@ teams:
       usage: "Usage of option register: /uhc teams register <teamName>"
     setmaxsize:
       notice: "Invalid arguments for the option setMaxSize in the command /uhc teams <option>!"
-      usage: "Usage of option setMaxSize: /uhc teams setMaxSize <teamName> <number>"
+      usage: "Usage of option setMaxSize: /uhc teams setMaxSize <teamName> <number> or /uhc teams setMaxSize <number>"
     nosuchoption: "No such option available for the command /uhc teams <option>!"
     availableoptions: "Available options are: register, add, kick, delete, setMaxSize."
 
diff --git a/resources/lang-packages/lang_es.yml b/resources/lang-packages/lang_es.yml
index deaf46c..5f2c341 100644
--- a/resources/lang-packages/lang_es.yml
+++ b/resources/lang-packages/lang_es.yml
@@ -124,7 +124,7 @@ teams:
       usage: "Uso correcto: /uhc teams register <teamName>"
     setmaxsize:
       notice: "Argumentos inválidos para la opción setMaxSize en el comando /uhc teams <option>!"
-      usage: "Uso correcto: /uhc teams setMaxSize <teamName> <number>"
+      usage: "Uso correcto: /uhc teams setMaxSize <teamName> <number> o /uhc teams setMaxSize <number>"
     nosuchoption: "No hay opción disponible para /uhc teams <option>!"
     availableoptions: "Las opciones disponibles son: register, add, kick, delete, setMaxSize."
 
diff --git a/src/me/PauMAVA/UhcPlugin/commands/UhcCompleteTab.java b/src/me/PauMAVA/UhcPlugin/commands/UhcCompleteTab.java
index 878e38a..d71ab90 100644
--- a/src/me/PauMAVA/UhcPlugin/commands/UhcCompleteTab.java
+++ b/src/me/PauMAVA/UhcPlugin/commands/UhcCompleteTab.java
@@ -65,7 +65,7 @@ private List<String> firstArg(String subCommand) {
 
 		}
 		if(subCommand.equalsIgnoreCase("teams")) {
-			return Arrays.asList("add","delete","get","kick","register");
+			return Arrays.asList("add","delete","get","kick","register","setMaxSize");
 		}
 		return new ArrayList<String>();
 	}
diff --git a/src/me/PauMAVA/UhcPlugin/teams/TeamsFile.java b/src/me/PauMAVA/UhcPlugin/teams/TeamsFile.java
index 716ec64..de9295d 100644
--- a/src/me/PauMAVA/UhcPlugin/teams/TeamsFile.java
+++ b/src/me/PauMAVA/UhcPlugin/teams/TeamsFile.java
@@ -31,6 +31,7 @@
 import me.PauMAVA.UhcPlugin.UhcPluginCore;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
+import sun.security.krb5.Config;
 
 public class TeamsFile {
 	
@@ -197,7 +198,12 @@ public boolean setMaxTeamSize(String teamName, String value) {
 			e.printStackTrace();
 			return false;
 		}
-		teamsConfig.getConfigurationSection("teams." + teamName).set("teamSize", valueInt);
+		ConfigurationSection section = teamsConfig.getConfigurationSection("teams." + teamName);
+		if (section == null) {
+			return false;
+		} else {
+			section.set("teamSize", valueInt);
+		}
 		return true;
 	}
 
diff --git a/src/me/PauMAVA/UhcPlugin/teams/UhcTeamsManager.java b/src/me/PauMAVA/UhcPlugin/teams/UhcTeamsManager.java
index c399869..cf9d923 100644
--- a/src/me/PauMAVA/UhcPlugin/teams/UhcTeamsManager.java
+++ b/src/me/PauMAVA/UhcPlugin/teams/UhcTeamsManager.java
@@ -88,28 +88,12 @@ public static void cmdReciever(CommandSender theSender,String[] args) {
 				break;
 			}	
 			case "setmaxsize": {
-				int newSize = Integer.parseInt(args[2]);
-				int actualSize = teamsConfig.getTeamMembers(args[1]).size();
-				if(newSize == actualSize) {
-					sendMessage(theSender, PluginStrings.INFO_PREFIX.toString() + PluginStrings.TEAMS_THE_TEAM.toString() + args[1] + PluginStrings.TEAMS_SAME_SIZE.toString() + newSize + PluginStrings.TEAMS_NO_CHANGES.toString());
-					break;
-				}
-				if(newSize < actualSize) {
-					List<String> ls = teamsConfig.settleNewSize(args[1] , actualSize - newSize);
-					sendMessage(theSender, PluginStrings.WARNING_PREFIX.toString() + PluginStrings.TEAMS_AUTOKICK_NOTICE.toString());
-					for(String kickedPlayer: ls) {
-						sendMessage(theSender, ChatColor.YELLOW + "  - " + kickedPlayer);
+				if (args.length == 2) {
+					for (String teamName: teamsConfig.getTeams()) {
+						resizeTeam(theSender, teamName, Integer.parseInt(args[1]));
 					}
-					sendMessage(theSender, PluginStrings.INFO_PREFIX.toString() + PluginStrings.TEAMS_SIZE_CHANGE_SUCCESS.toString() + args[1] + ".");
-					teamsConfig.saveConfig();
-					break;
-				}
-				boolean check = teamsConfig.setMaxTeamSize(args[1],args[2]);
-				teamsConfig.saveConfig();
-				if(check) {
-					sendMessage(theSender, PluginStrings.INFO_PREFIX.toString() + args[1] +  PluginStrings.TEAMS_SIZE_CHANGE_SUCCESS2.toString() + args[2] + ".");
-				} else {
-					sendMessage(theSender, PluginStrings.ERROR_PREFIX.toString() + PluginStrings.TEAMS_UNEXPECTED_ERROR.toString());
+				} else if (args.length == 3){
+					resizeTeam(theSender, args[1], Integer.parseInt(args[2]));
 				}
 				break;
 			}
@@ -175,7 +159,7 @@ private static boolean checkForLegalArgs(CommandSender theSender, String[] args)
 				break;
 			}
 			case "setmaxsize": {
-				if(length != 3 || isNotInt(args[2])) {
+				if((length == 2 && isNotInt(args[1])) || (length == 3 && isNotInt(args[2]))) {
 					sendMessage(theSender, PluginStrings.ERROR_PREFIX.toString() + PluginStrings.TEAMS_LEGAL_ARGS_MAXSIZE_NOTICE.toString());
 					sendMessage(theSender, PluginStrings.ERROR_PREFIX.toString() + PluginStrings.TEAMS_LEGAL_ARGS_MAXSIZE_USAGE.toString());
 					return false;
@@ -344,4 +328,29 @@ public void run() {
 			}
 		}.runTaskLater(plugin, 40L);
 	}
+
+	private static void resizeTeam(CommandSender theSender, String teamName, int newSize) {
+		int actualSize = teamsConfig.getTeamMembers(teamName).size();
+		if(newSize == actualSize) {
+			sendMessage(theSender, PluginStrings.INFO_PREFIX.toString() + PluginStrings.TEAMS_THE_TEAM.toString() + teamName + PluginStrings.TEAMS_SAME_SIZE.toString() + newSize + PluginStrings.TEAMS_NO_CHANGES.toString());
+			return;
+		}
+		if(newSize < actualSize) {
+			List<String> ls = teamsConfig.settleNewSize(teamName , actualSize - newSize);
+			sendMessage(theSender, PluginStrings.WARNING_PREFIX.toString() + PluginStrings.TEAMS_AUTOKICK_NOTICE.toString());
+			for(String kickedPlayer: ls) {
+				sendMessage(theSender, ChatColor.YELLOW + "  - " + kickedPlayer);
+			}
+			sendMessage(theSender, PluginStrings.INFO_PREFIX.toString() + PluginStrings.TEAMS_SIZE_CHANGE_SUCCESS.toString() + teamName + ".");
+			teamsConfig.saveConfig();
+			return;
+		}
+		boolean check = teamsConfig.setMaxTeamSize(teamName,String.valueOf(newSize));
+		teamsConfig.saveConfig();
+		if(check) {
+			sendMessage(theSender, PluginStrings.INFO_PREFIX.toString() + teamName +  PluginStrings.TEAMS_SIZE_CHANGE_SUCCESS2.toString() + newSize + ".");
+		} else {
+			sendMessage(theSender, PluginStrings.ERROR_PREFIX.toString() + PluginStrings.TEAMS_UNEXPECTED_ERROR.toString());
+		}
+	}
 }
\ No newline at end of file