diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml
index 6cee9993c4..1cc114c904 100644
--- a/Mage.Client/pom.xml
+++ b/Mage.Client/pom.xml
@@ -1,148 +1,186 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.mage</groupId>
-		<artifactId>mage-root</artifactId>
-		<version>0.7.2</version>
-	</parent>
+    <parent>
+        <groupId>org.mage</groupId>
+        <artifactId>mage-root</artifactId>
+        <version>0.7.2</version>
+    </parent>
 
-	<groupId>org.mage</groupId>
-	<artifactId>Mage-Client</artifactId>
-	<packaging>jar</packaging>	
-	<name>Mage Client</name>	
+    <groupId>org.mage</groupId>
+    <artifactId>Mage-Client</artifactId>
+    <packaging>jar</packaging>
+    <name>Mage Client</name>
 
-	<dependencies>                                
-		<dependency>
-			<groupId>org.mage</groupId>
-			<artifactId>Mage</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mage</groupId>
-			<artifactId>Mage-Common</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mage</groupId>
-			<artifactId>Mage-Sets</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.googlecode.jspf</groupId>
-			<artifactId>jspf-core</artifactId>
-			<version>0.9.1</version>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.9</version>
-		</dependency>
-		<dependency>
-			<groupId>com.mortennobel</groupId>
-			<artifactId>java-image-scaling</artifactId>
-			<version>0.8.4</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.collections</groupId>
-			<artifactId>google-collections</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.swinglabs</groupId>
-			<artifactId>swingx</artifactId>
-			<version>1.6.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jetlang</groupId>
-  			<artifactId>jetlang</artifactId>
-  			<version>0.2.4</version>
-		</dependency>
+    <dependencies>
         <dependency>
-			<groupId>com.jgoodies</groupId>
-  			<artifactId>forms</artifactId>
-  			<version>1.2.1</version>
-		</dependency>
-        <dependency>
-          <groupId>com.intellij</groupId>
-          <artifactId>forms_rt</artifactId>
-          <version>7.0.3</version>
+            <groupId>org.mage</groupId>
+            <artifactId>Mage</artifactId>
+            <version>${project.version}</version>
         </dependency>
-		<!-- 
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.2</version>
-			<type>jar</type>
-			<scope>test</scope>
-		</dependency>
-		 -->
-	 <dependency>
-	  <groupId>${project.groupId}</groupId>
-	  <artifactId>Mage-Theme-Plugin</artifactId>
-	  <version>0.4</version>
-	  <scope>runtime</scope>
-	 </dependency>
-	 <dependency>
-	  <groupId>${project.groupId}</groupId>
-	  <artifactId>Mage-Card-Plugin</artifactId>
-	  <version>0.5</version>
-	  <scope>runtime</scope>
-	 </dependency>
-	 <dependency>
-	  <groupId>${project.groupId}</groupId>
-	  <artifactId>Mage-Counter-Plugin</artifactId>
-	  <version>0.1</version>
-	  <scope>runtime</scope>
-	 </dependency>
-	</dependencies>
+        <dependency>
+            <groupId>org.mage</groupId>
+            <artifactId>Mage-Common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mage</groupId>
+            <artifactId>Mage-Sets</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.jspf</groupId>
+            <artifactId>jspf-core</artifactId>
+            <version>0.9.1</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.9</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mortennobel</groupId>
+            <artifactId>java-image-scaling</artifactId>
+            <version>0.8.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.collections</groupId>
+            <artifactId>google-collections</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.swinglabs</groupId>
+            <artifactId>swingx</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetlang</groupId>
+            <artifactId>jetlang</artifactId>
+            <version>0.2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.jgoodies</groupId>
+            <artifactId>forms</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.intellij</groupId>
+            <artifactId>forms_rt</artifactId>
+            <version>7.0.3</version>
+        </dependency>
+        <!--
+          <dependency>
+              <groupId>junit</groupId>
+              <artifactId>junit</artifactId>
+              <version>4.8.2</version>
+              <type>jar</type>
+              <scope>test</scope>
+          </dependency>
+           -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>Mage-Theme-Plugin</artifactId>
+            <version>0.4</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>Mage-Card-Plugin</artifactId>
+            <version>0.5</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>Mage-Counter-Plugin</artifactId>
+            <version>0.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-install-plugin</artifactId>
-				<version>2.3.1</version>
-			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<configuration>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<classpathPrefix>lib/</classpathPrefix>
-							<mainClass>mage.client.MageFrame</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-                                        <appendAssemblyId>false</appendAssemblyId>
-					<descriptors>
-						<descriptor>src/main/assembly/distribution.xml</descriptor>
-					</descriptors>
-				</configuration>
-			</plugin>
-		</plugins>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.3.1</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>mage.client.MageFrame</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>src/main/assembly/distribution.xml</descriptor>
+                    </descriptors>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.akathist.maven.plugins.launch4j</groupId>
+                <artifactId>launch4j-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>l4j-mage-client</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>launch4j</goal>
+                        </goals>
+                        <configuration>
+                            <headerType>console</headerType>
+                            <outfile>target/mage-client-${project.version}.exe</outfile>
+                            <jar>target/mage-client.jar</jar>
+                            <errTitle>Mage Client</errTitle>
+                            <classPath>
+                                <mainClass>mage.client.MageFrame</mainClass>
+                                <addDependencies>true</addDependencies>
+                                <preCp>anything</preCp>
+                            </classPath>
+                            <jre>
+                                <minVersion>1.5.0</minVersion>
+                            </jre>
+                            <versionInfo>
+                                <fileVersion>0.7.2.0</fileVersion>
+                                <txtFileVersion>MAGE Client</txtFileVersion>
+                                <fileDescription>Mage Client</fileDescription>
+                                <copyright>(C) Mage Development Team</copyright>
+                                <productVersion>0.7.2.0</productVersion>
+                                <txtProductVersion>MAGE Client</txtProductVersion>
+                                <productName>MAGE</productName>
+                                <internalName>Mage-Client</internalName>
+                                <originalFilename>original.exe</originalFilename>
+                            </versionInfo>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
 
-		<finalName>mage-client</finalName>
-	</build>	
+        <finalName>mage-client</finalName>
+    </build>
 </project>
diff --git a/Mage.Client/src/main/assembly/distribution.xml b/Mage.Client/src/main/assembly/distribution.xml
index e778a46511..46c033403b 100644
--- a/Mage.Client/src/main/assembly/distribution.xml
+++ b/Mage.Client/src/main/assembly/distribution.xml
@@ -28,7 +28,8 @@
         <includes>
             <include>org.mage:Mage-Theme-Plugin</include>
             <include>org.mage:Mage-Card-Plugin</include>
-            <include>org.mage:Mage-Counter-Plugin</include>           
+            <include>org.mage:Mage-Counter-Plugin</include>
+            <include>org.mage:Mage-Counter-Plugin</include>
         </includes>
     </dependencySet>
   </dependencySets>
@@ -37,6 +38,14 @@
       <filtered>true</filtered>
       <directory>release/</directory>
       <outputDirectory>/</outputDirectory>      
-    </fileSet>    
+    </fileSet>
+    <fileSet>
+        <filtered>false</filtered>
+        <directory>target/</directory>
+        <includes>
+            <include>*.exe</include>
+        </includes>
+        <outputDirectory>/</outputDirectory>
+    </fileSet>
   </fileSets>
 </assembly>
diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml
index db26a5a387..058b987b9f 100644
--- a/Mage.Server/pom.xml
+++ b/Mage.Server/pom.xml
@@ -1,18 +1,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-  
+
     <parent>
         <groupId>org.mage</groupId>
         <artifactId>mage-root</artifactId>
         <version>0.7.2</version>
     </parent>
-	
+
     <artifactId>Mage-Server</artifactId>
     <packaging>jar</packaging>
-    <name>Mage Server</name>   
-	
+    <name>Mage Server</name>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -39,7 +39,7 @@
             <artifactId>jaxb-impl</artifactId>
             <version>2.1.12</version>
         </dependency>
-		
+
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
@@ -94,20 +94,20 @@
             <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>Mage-Tournament-BoosterDraft</artifactId>
-			<version>${project.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>Mage-Tournament-Sealed</artifactId>
-			<version>${project.version}</version>
-			<scope>runtime</scope>
-		</dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>Mage-Tournament-BoosterDraft</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>Mage-Tournament-Sealed</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
-	
+
     <pluginRepositories>
         <pluginRepository>
             <id>maven2-repository.dev.java.net</id>
@@ -115,7 +115,7 @@
             <url>http://download.java.net/maven/2</url>
         </pluginRepository>
     </pluginRepositories>
-	
+
     <build>
         <plugins>
             <plugin>
@@ -171,11 +171,49 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.akathist.maven.plugins.launch4j</groupId>
+                <artifactId>launch4j-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>l4j-mage-server</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>launch4j</goal>
+                        </goals>
+                        <configuration>
+                            <headerType>console</headerType>
+                            <outfile>target/mage-server-${project.version}.exe</outfile>
+                            <jar>target/mage-server.jar</jar>
+                            <errTitle>Mage Server</errTitle>
+                            <classPath>
+                                <mainClass>mage.server.Main</mainClass>
+                                <addDependencies>true</addDependencies>
+                                <preCp>anything</preCp>
+                            </classPath>
+                            <jre>
+                                <minVersion>1.5.0</minVersion>
+                            </jre>
+                            <versionInfo>
+                                <fileVersion>0.7.2.0</fileVersion>
+                                <txtFileVersion>MAGE Server</txtFileVersion>
+                                <fileDescription>Mage Server</fileDescription>
+                                <copyright>(C) Mage Development Team</copyright>
+                                <productVersion>0.7.2.0</productVersion>
+                                <txtProductVersion>MAGE Server</txtProductVersion>
+                                <productName>MAGE</productName>
+                                <internalName>Mage-Server</internalName>
+                                <originalFilename>original.exe</originalFilename>
+                            </versionInfo>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
-    
+
         <finalName>mage-server</finalName>
     </build>
-  
+
     <properties/>
-	
+
 </project>
diff --git a/Mage.Server/src/main/assembly/distribution.xml b/Mage.Server/src/main/assembly/distribution.xml
index a02c64f44d..4bb52a2513 100644
--- a/Mage.Server/src/main/assembly/distribution.xml
+++ b/Mage.Server/src/main/assembly/distribution.xml
@@ -1,56 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
                       http://maven.apache.org/xsd/assembly-1.1.1.xsd">
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>org.mage:Mage-Server</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-        <outputDirectory>/plugins</outputDirectory>
-        <includes>
-            <include>org.mage:Mage-Deck-Constructed</include>
-            <include>org.mage:Mage-Deck-Limited</include>
-            <include>org.mage:Mage-Game-FreeForAll</include>
-            <include>org.mage:Mage-Game-TwoPlayerDuel</include>
-            <include>org.mage:Mage-Player-AI</include>
-            <include>org.mage:Mage-Player-AIMinimax</include>
-            <include>org.mage:Mage-Player-AI-MA</include>
-            <include>org.mage:Mage-Player-Human</include>
-			<include>org.mage:Mage-Tournament-BoosterDraft</include>
-			<include>org.mage:Mage-Tournament-Sealed</include>
-        </includes>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>/lib/</outputDirectory>
-      <excludes>
-          <exclude>org.mage:Mage-Server</exclude>
-          <exclude>org.mage:Mage-Deck-Constructed</exclude>
-          <exclude>org.mage:Mage-Deck-Limited</exclude>
-          <exclude>org.mage:Mage-Game-FreeForAll</exclude>
-          <exclude>org.mage:Mage-Game-TwoPlayerDuel</exclude>
-          <exclude>org.mage:Mage-Player-AI</exclude>
-          <exclude>org.mage:Mage-Player-AIMinimax</exclude>
-          <exclude>org.mage:Mage-Player-AI-MA</exclude>
-          <exclude>org.mage:Mage-Player-Human</exclude>
-		  <exclude>org.mage:Mage-Tournament-BoosterDraft</exclude>
-		  <exclude>org.mage:Mage-Tournament-Sealed</exclude>
-      </excludes>
-    </dependencySet>    
-  </dependencySets>
-  <fileSets>
-    <fileSet>
-      <filtered>true</filtered>
-      <directory>release/</directory>
-      <outputDirectory>/</outputDirectory>      
-    </fileSet>    
-  </fileSets>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>org.mage:Mage-Server</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/plugins</outputDirectory>
+            <includes>
+                <include>org.mage:Mage-Deck-Constructed</include>
+                <include>org.mage:Mage-Deck-Limited</include>
+                <include>org.mage:Mage-Game-FreeForAll</include>
+                <include>org.mage:Mage-Game-TwoPlayerDuel</include>
+                <include>org.mage:Mage-Player-AI</include>
+                <include>org.mage:Mage-Player-AIMinimax</include>
+                <include>org.mage:Mage-Player-AI-MA</include>
+                <include>org.mage:Mage-Player-Human</include>
+                <include>org.mage:Mage-Tournament-BoosterDraft</include>
+                <include>org.mage:Mage-Tournament-Sealed</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/lib/</outputDirectory>
+            <excludes>
+                <exclude>org.mage:Mage-Server</exclude>
+                <exclude>org.mage:Mage-Deck-Constructed</exclude>
+                <exclude>org.mage:Mage-Deck-Limited</exclude>
+                <exclude>org.mage:Mage-Game-FreeForAll</exclude>
+                <exclude>org.mage:Mage-Game-TwoPlayerDuel</exclude>
+                <exclude>org.mage:Mage-Player-AI</exclude>
+                <exclude>org.mage:Mage-Player-AIMinimax</exclude>
+                <exclude>org.mage:Mage-Player-AI-MA</exclude>
+                <exclude>org.mage:Mage-Player-Human</exclude>
+                <exclude>org.mage:Mage-Tournament-BoosterDraft</exclude>
+                <exclude>org.mage:Mage-Tournament-Sealed</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <filtered>true</filtered>
+            <directory>release/</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <filtered>false</filtered>
+            <directory>target/</directory>
+            <includes>
+                <include>*.exe</include>
+            </includes>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+    </fileSets>
 </assembly>
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TreasureMage.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TreasureMage.java
new file mode 100644
index 0000000000..8078cfe9da
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TreasureMage.java
@@ -0,0 +1,79 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+
+package mage.sets.mirrodinbesieged;
+
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.SearchEffect;
+import mage.abilities.effects.common.search.SearchLibraryRevealPutInHandEffect;
+import mage.cards.CardImpl;
+import mage.filter.Filter;
+import mage.filter.FilterCard;
+import mage.target.common.TargetCardInLibrary;
+
+/**
+ *
+ * @author Loki
+ */
+public class TreasureMage extends CardImpl<TreasureMage> {
+
+    private static FilterCard filter = new FilterCard("an artifact card with converted mana cost 6 or more");
+
+	static {
+		filter.getCardType().add(CardType.ARTIFACT);
+		filter.setConvertedManaCost(5);
+		filter.setConvertedManaCostComparison(Filter.ComparisonType.GreaterThan);
+	}
+
+    public TreasureMage (UUID ownerId) {
+        super(ownerId, 34, "Treasure Mage", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{U}");
+        this.expansionSetCode = "MBS";
+        this.subtype.add("Human");
+        this.subtype.add("Wizard");
+		this.color.setBlue(true);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+        TargetCardInLibrary target = new TargetCardInLibrary(0, 1, filter);
+		SearchEffect effect = new SearchLibraryRevealPutInHandEffect(target);
+		this.addAbility(new EntersBattlefieldTriggeredAbility(effect, true));
+    }
+
+    public TreasureMage (final TreasureMage card) {
+        super(card);
+    }
+
+    @Override
+    public TreasureMage copy() {
+        return new TreasureMage(this);
+    }
+
+}
diff --git a/pom.xml b/pom.xml
index 3bd0580380..a070a2754b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,7 @@
         <module>Mage.Client</module>
         <module>Mage.Plugins</module>
         <module>Mage.Server.Plugins</module>
+        <module>Mage.Tests</module>
     </modules>
 
     <repositories>
@@ -43,8 +44,21 @@
             <name>Jetlang Repository for Maven</name>
             <url>http://jetlang.googlecode.com/svn/repo/</url>
         </repository>
+        <repository>
+          <id>akathist-repository</id>
+          <name>Akathist Repository</name>
+          <url>http://www.9stmaryrd.com/maven</url>
+      </repository>
     </repositories>
 
+    <pluginRepositories>
+      <pluginRepository>
+          <id>akathist-repository</id>
+          <name>Akathist Repository</name>
+          <url>http://www.9stmaryrd.com/maven</url>
+      </pluginRepository>
+  </pluginRepositories>
+
     <properties>
         <mage-version>0.7.2</mage-version>
     </properties>