diff --git a/pom.xml b/pom.xml
index 530bdc2..18aa7f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,9 +2,9 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.github.tbmcplugins</groupId>
+	<groupId>com.github.TBMCPlugins</groupId>
 	<artifactId>DiscordPlugin</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>master-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>DiscordPlugin</name>
diff --git a/src/main/java/buttondevteam/discordplugin/CommandListener.java b/src/main/java/buttondevteam/discordplugin/CommandListener.java
index 397741d..724d9f1 100644
--- a/src/main/java/buttondevteam/discordplugin/CommandListener.java
+++ b/src/main/java/buttondevteam/discordplugin/CommandListener.java
@@ -34,9 +34,12 @@ public class CommandListener {
 
 	private static void runCommand(IMessage message) {
 		String cmdwithargs = message.getContent();
-		final String mention = DiscordPlugin.dc.getOurUser().mention();
-		if (message.getContent().startsWith(mention)) // TODO: Resolve mentions: Compound arguments, either a mention or text
-			cmdwithargs = cmdwithargs.substring(mention.length());
+		final String mention = DiscordPlugin.dc.getOurUser().mention(false);
+		final String mentionNick = DiscordPlugin.dc.getOurUser().mention(true);
+		if (message.getContent().startsWith(mention) && cmdwithargs.length() > mention.length() + 1) // TODO: Resolve mentions: Compound arguments, either a mention or text
+			cmdwithargs = cmdwithargs.substring(mention.length() + 1);
+		if (message.getContent().startsWith(mentionNick) && cmdwithargs.length() > mentionNick.length() + 1)
+			cmdwithargs = cmdwithargs.substring(mentionNick.length() + 1);
 		int index = cmdwithargs.indexOf(' ');
 		String cmd;
 		String args;
@@ -45,7 +48,7 @@ public class CommandListener {
 			args = "";
 		} else {
 			cmd = cmdwithargs.substring(0, index);
-			args = cmdwithargs.substring(index);
+			args = cmdwithargs.substring(index + 1);
 		}
 		DiscordCommandBase.runCommand(cmd, args, message);
 	}
diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
index 8ea9d42..a32125c 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
@@ -14,7 +14,9 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
+import buttondevteam.discordplugin.mccommands.DiscordMCCommandBase;
 import buttondevteam.lib.TBMCCoreAPI;
+import buttondevteam.lib.chat.TBMCChatAPI;
 import sx.blah.discord.api.*;
 import sx.blah.discord.api.events.IListener;
 import sx.blah.discord.handle.impl.events.ReadyEvent;
@@ -54,6 +56,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
 			for (IListener<?> listener : CommandListener.getListeners())
 				dc.getDispatcher().registerListener(listener);
 			Bukkit.getPluginManager().registerEvents(new MCListener(), this);
+			TBMCChatAPI.AddCommands(this, DiscordMCCommandBase.class);
 		} catch (Exception e) {
 			e.printStackTrace();
 			Bukkit.getPluginManager().disablePlugin(this);
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index b04bce3..85bbe30 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -3,3 +3,5 @@ main: buttondevteam.discordplugin.DiscordPlugin
 version: 1.0
 author: TBMCPlugins
 depend: []
+commands:
+    discord: