diff --git a/aliases.yml b/aliases.yml
index 4e5aa63..583f1d1 100644
--- a/aliases.yml
+++ b/aliases.yml
@@ -1,7 +1,7 @@
 #'dumb' parameter, will just use what you put in
 banhammer:
     1: /ban !1
-#name parameter is replaced with the person's name
+#name parameter is replaced with the command users name
 gmon: 
     0: /gamemode !name 1
 gmoff: 
@@ -18,4 +18,7 @@ bring:
 tpthenkick: 
     1: 
       - /tp !1p !name
-      - /kick !1p
\ No newline at end of file
+      - /kick !1p
+# special command for toggling GM mode
+gm: 
+    0: /gamemode !name !oppositeGameMode
\ No newline at end of file
diff --git a/com/gmail/Ne0nx3r0/BetterAliasPlayerListener.java b/com/gmail/Ne0nx3r0/BetterAliasPlayerListener.java
index 3f557b1..68cbcd5 100644
--- a/com/gmail/Ne0nx3r0/BetterAliasPlayerListener.java
+++ b/com/gmail/Ne0nx3r0/BetterAliasPlayerListener.java
@@ -3,6 +3,7 @@ package com.gmail.Ne0nx3r0;
 import com.gmail.Ne0nx3r0.AliasManager.AliasManager;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -40,6 +41,9 @@ class BetterAliasPlayerListener implements Listener{
                             
                             if(text.equalsIgnoreCase("name")){
                                 text = player.getName();
+                            }else if(text.equalsIgnoreCase("oppositeGameMode")){
+                                text = (player.getGameMode() == GameMode.SURVIVAL ? "1" : "0");
+                                
                             }else if(text.length() >= 2 && text.substring(1,2).equalsIgnoreCase("p")){
                                 int iParam = -1;
                                 
diff --git a/plugin.yml b/plugin.yml
index fe2c8ce..e012df5 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,5 +1,5 @@
 name: BetterAlias
 main: com.gmail.Ne0nx3r0.BetterAlias
-version: '0.1.1'
+version: '0.1.2'
 database: false
 description: Command alias system
\ No newline at end of file