diff --git a/build.gradle b/build.gradle
index e57ebf5..e31d0a4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ minecraft {
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 group = 'me.ordalca.combocommands'
-version = '1.0.1'
+version = '1.0.2'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
diff --git a/src/main/java/me/ordalca/combocommands/init/ComboCommand.java b/src/main/java/me/ordalca/combocommands/init/ComboCommand.java
index c6dc0af..4e60f76 100644
--- a/src/main/java/me/ordalca/combocommands/init/ComboCommand.java
+++ b/src/main/java/me/ordalca/combocommands/init/ComboCommand.java
@@ -1,5 +1,6 @@
 package me.ordalca.combocommands.init;
 
+import com.google.common.collect.Lists;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.pixelmonmod.pixelmon.api.command.PixelmonCommandUtils;
@@ -8,9 +9,12 @@
 import net.minecraft.command.CommandException;
 import net.minecraft.command.CommandSource;
 import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fml.server.ServerLifecycleHooks;
 
+import java.util.List;
 import java.util.Locale;
 
 
@@ -45,4 +49,15 @@ public void execute(CommandSource sender, String[] args) throws CommandException
             PixelmonCommandUtils.sendMessage(sender, "Catch combo setting failed.");
         }
     }
+
+    @Override
+    public List<String> getTabCompletions(MinecraftServer server, CommandSource sender, String[] args, BlockPos pos) {
+        if (args.length == 1) {
+            return PixelmonCommandUtils.tabCompleteUsernames();
+        } else if (args.length == 2) {
+            return PixelmonCommandUtils.tabCompletePokemon();
+        } else {
+            return Lists.newArrayList();
+        }
+    }
 }
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 5058c97..61b8f85 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -4,10 +4,10 @@ license="MIT"
 
 [[mods]]
 modId="combocommands"
-version="1.0.0"
+version="1.0.2"
 displayName="ComboCommands"
 displayURL="https://github.com/Ordalca/ComboCommands"
-credits="Ordalca"
+credits="Ordalca & BeeLeDev"
 authors="Ordalca"
 description='''
 Mod adding commands related to Capture Combos.