diff --git a/Mage.Client/src/main/java/mage/client/cards/CardsStorage.java b/Mage.Client/src/main/java/mage/client/cards/CardsStorage.java
index 4019e7efa2d..baf0a3c52da 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardsStorage.java
+++ b/Mage.Client/src/main/java/mage/client/cards/CardsStorage.java
@@ -175,6 +175,7 @@ public class CardsStorage {
 			readUnimplemented("SOM", "/som.txt", names, cards);
 			readUnimplemented("MBS", "/mbs.txt", names, cards);
 			readUnimplemented("NPH", "/nph.txt", names, cards);
+			readUnimplemented("M12", "/m12.txt", names, cards);
 
 			names.clear();
 			names = null;
@@ -206,6 +207,18 @@ public class CardsStorage {
 						card.getCardType().clear();
 						cards.add(card);
 					}
+				} else { // for m12 and further
+					String name = s[0].trim();
+					if (!names.contains(set + name)) {
+						Integer cid = Integer.parseInt(s[2]);
+						Card card = tmp.copy();
+						card.setName(name);
+						card.setExpansionSetCode(set);
+						card.setCardNumber(cid);
+						card.setRarity(Constants.Rarity.NA); // mark as not implemented
+						card.getCardType().clear();
+						cards.add(card);
+					}
 				}
 			}
 		} catch (Exception e) {
@@ -232,7 +245,7 @@ public class CardsStorage {
 	 * @author nantuko
 	 */
 	private static class CardComparator implements Comparator<Card> {
-		private static final String LATEST_SET_CODE = "NPH";
+		private static final String LATEST_SET_CODE = "M12";
 
 		@Override
 		public int compare(Card o1, Card o2) {
@@ -273,6 +286,7 @@ public class CardsStorage {
 			latestSetCodes.add("SOM");
 			latestSetCodes.add("MBS");
 			latestSetCodes.add("NPH");
+			latestSetCodes.add("M12");
 		}
 		
 		@Override
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
index 76988fd7150..70cf2eff87b 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
@@ -305,7 +305,7 @@ public class MageBook extends JComponent {
 	private HoverButton pageRight;
 
 	private int currentPage = 0;
-	private String currentSet = "NPH";
+	private String currentSet = "M12";
 
 	private static CardDimensions cardDimensions = new CardDimensions(1.2d);
 	private static final Logger log = Logger.getLogger(MageBook.class);
diff --git a/Mage/src/mage/Mana.java b/Mage/src/mage/Mana.java
index 4b31e628dcf..8a875771111 100644
--- a/Mage/src/mage/Mana.java
+++ b/Mage/src/mage/Mana.java
@@ -364,7 +364,7 @@ public class Mana implements Comparable<Mana>, Serializable, Copyable<Mana> {
 
 	/**
 	 *
-	 * @param netMana
+	 * @param mana
 	 * @return true if this contains any values that mana has
 	 */
 	public boolean contains(Mana mana) {