diff --git a/resources/plugin.yml b/resources/plugin.yml
index 84c41be..5635161 100644
--- a/resources/plugin.yml
+++ b/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: MobArena
 author: garbagemule
 main: com.garbagemule.MobArena.MobArena
-version: 0.94.4.98.3
+version: 0.94.4.98.4
 softdepend: [Spout,Towny,Heroes,MagicSpells,Vault]
 commands:
     ma:
diff --git a/resources/res/settings.yml b/resources/res/settings.yml
index 8738fe5..58e51fe 100644
--- a/resources/res/settings.yml
+++ b/resources/res/settings.yml
@@ -33,5 +33,6 @@ spout-class-select: false
 player-time-in-arena: world
 auto-ignite-tnt: false
 auto-start-timer: 0
+auto-ready: false
 use-class-chests: false
 display-waves-as-level: false
diff --git a/src/com/garbagemule/MobArena/ArenaImpl.java b/src/com/garbagemule/MobArena/ArenaImpl.java
index 1f17fce..4dcf225 100644
--- a/src/com/garbagemule/MobArena/ArenaImpl.java
+++ b/src/com/garbagemule/MobArena/ArenaImpl.java
@@ -948,6 +948,14 @@ public class ArenaImpl implements Arena
         
         arenaPlayer.setArenaClass(arenaClass);
         arenaClass.grantItems(p);
+        
+        if (settings.getBoolean("auto-ready", false)) {
+            if (autoStartTimer.getRemaining() <= 0) {
+                playerReady(p);
+            } else {
+                readyPlayers.add(p);
+            }
+        }
     }
     
     @Override