diff --git a/app.js b/app.js
index 815f26c..8ff8c3d 100644
--- a/app.js
+++ b/app.js
@@ -1,13 +1,15 @@
 var mcServer=require("./index");
 
 var settings = require('./config/settings');
+var commands = require('./config/commands');
 
 var options = {
   motd: settings.motd,
   'max-players': settings.maxPlayers,
   port: settings.port,
   'online-mode': settings.onlineMode,
-  gameMode:settings.gameMode
+  gameMode:settings.gameMode,
+  commands: commands
 };
 
 mcServer.createMCServer(options);
diff --git a/lib/playerPlugins/chat.js b/lib/playerPlugins/chat.js
index e04ad27..db8c592 100644
--- a/lib/playerPlugins/chat.js
+++ b/lib/playerPlugins/chat.js
@@ -1,10 +1,14 @@
 module.exports=inject;
 
-function inject(serv,player)
+function inject(serv, player, options)
 {
   player._client.on('chat', function (data) {
+  if(data.message[0]=="/" && options.commands[data.message.slice(1)]) {
+    player.chat("" + options.commands[data.message.slice(1)]);
+  } else {
     serv.broadcast('<' + player.username + '>' + ' ' + data.message);
     player.emit("chat",data.message);
+  }
   });
 
   function chat(message) {