diff --git a/resources/magic/data/cards.txt b/resources/magic/data/cards.txt
index 0fde6ee2ef..b6d9abc846 100644
--- a/resources/magic/data/cards.txt
+++ b/resources/magic/data/cards.txt
@@ -1290,6 +1290,19 @@ toughness=5
 ability=reach
 timing=main
 
+>Stonybrook Schoolmaster
+image=http://magiccards.info/scans/en/mt/25.jpg
+value=2
+rarity=C
+type=Creature
+subtype=Merfolk,Wizard
+color=w
+converted=3
+cost={2}{W}
+power=1
+toughness=2
+timing=main
+
 >Tormented Soul
 image=http://magiccards.info/scans/en/m12/114.jpg
 value=2
diff --git a/resources/magic/data/images.txt b/resources/magic/data/images.txt
index 603ed4af4e..6781687322 100644
--- a/resources/magic/data/images.txt
+++ b/resources/magic/data/images.txt
@@ -80,6 +80,7 @@ Elephant.jpg;http://magiccards.info/extras/token/worldwake/elephant.jpg
 Faerie Rogue.jpg;http://magiccards.info/extras/token/morningtide/faerie-rogue.jpg
 Germ.jpg;http://magiccards.info/extras/token/mirrodin-besieged/germ.jpg
 Goblin Soldier.jpg;http://magiccards.info/extras/token/eventide/goblin-soldier.jpg
+Merfolk Wizard.jpg;http://magiccards.info/extras/token/lorwyn/merfolk-wizard.jpg
 Ogre.jpg;http://magiccards.info/extras/token/worldwake/ogre.jpg
 Saproling.jpg;http://magiccards.info/extras/token/tenth-edition/saproling.jpg
 Snake.jpg;http://magiccards.info/extras/token/zendikar/snake.jpg
diff --git a/src/magic/card/Stonybrook_Schoolmaster.java b/src/magic/card/Stonybrook_Schoolmaster.java
new file mode 100644
index 0000000000..3b753467b6
--- /dev/null
+++ b/src/magic/card/Stonybrook_Schoolmaster.java
@@ -0,0 +1,34 @@
+package magic.card;
+
+import magic.data.TokenCardDefinitions;
+import magic.model.MagicGame;
+import magic.model.MagicPermanent;
+import magic.model.MagicPlayer;
+import magic.model.action.MagicPlayTokenAction;
+import magic.model.event.MagicEvent;
+import magic.model.trigger.MagicWhenBecomesTappedTrigger;
+
+public class Stonybrook_Schoolmaster {
+    public static final MagicWhenBecomesTappedTrigger T = new MagicWhenBecomesTappedTrigger() {
+    	@Override
+    	public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent data) {
+    		final MagicPlayer player = permanent.getController();
+    		return (permanent == data) ?
+                new MagicEvent(
+                        permanent,
+                        player,
+                        new Object[]{player},
+                        this,
+                        player + " puts a 1/1 blue Merfolk Wizard creature token onto the battlefield.") :
+                MagicEvent.NONE;
+    	}
+    	@Override
+    	public void executeEvent(
+                final MagicGame game,
+                final MagicEvent event,
+                final Object data[],
+                final Object[] choiceResults) {
+    		game.doAction(new MagicPlayTokenAction((MagicPlayer)data[0],TokenCardDefinitions.MERFOLK_WIZARD_TOKEN_CARD));
+    	}
+    };
+}
diff --git a/src/magic/data/TokenCardDefinitions.java b/src/magic/data/TokenCardDefinitions.java
index a6f18a5302..3ac1a145c1 100644
--- a/src/magic/data/TokenCardDefinitions.java
+++ b/src/magic/data/TokenCardDefinitions.java
@@ -244,7 +244,21 @@ public class TokenCardDefinitions {
 			setToughness(3);
 			setAbility(MagicAbility.Flying);
 		}
-	};	
+	};
+	
+	public static final MagicCardDefinition MERFOLK_WIZARD_TOKEN_CARD = new MagicCardDefinition("Merfolk Wizard") {
+		public void initialize() {
+			setToken();
+			setValue(1);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Merfolk","Wizard"});
+			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.Blue);
+			setColoredType();
+			setPower(1);
+			setToughness(1);
+		}
+	};
 	
 	public static final MagicCardDefinition APE_TOKEN_CARD=new MagicCardDefinition("Ape","Ape") {
 		public void initialize() {
@@ -468,6 +482,7 @@ public class TokenCardDefinitions {
 		FAERIE_ROGUE_TOKEN_CARD,
 		GRIFFIN_TOKEN_CARD,
 		BIRD_TOKEN_CARD,
+		MERFOLK_WIZARD_TOKEN_CARD,
 		APE_TOKEN_CARD,
 		BEAST3_TOKEN_CARD,
 		BEAST4_TOKEN_CARD,