diff --git a/app/build.gradle b/app/build.gradle
index d61206c..6a744d0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "de.vanitasvitae.enigmandroid"
         minSdkVersion 15
         targetSdkVersion 21
-        versionCode 6
-        versionName "0.1.1-18.02.2015-beta"
+        versionCode 7
+        versionName "0.1.1-23.02.2015-beta"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/Enigma.java b/app/src/main/java/de/vanitasvitae/enigmandroid/Enigma.java
index 52d664d..148691e 100644
--- a/app/src/main/java/de/vanitasvitae/enigmandroid/Enigma.java
+++ b/app/src/main/java/de/vanitasvitae/enigmandroid/Enigma.java
@@ -148,6 +148,7 @@ public class Enigma
      */
     public static char[][] parsePlugs(String p) throws InvalidPlugboardConfigurationFormatException
     {
+        p = p.toUpperCase();
         //Check, if empty
         if (p.length() == 0)
         {
@@ -177,9 +178,15 @@ public class Enigma
                 //If it does
                 else
                 {
-                    //add it to the array
-                    plugs[i] = x.toCharArray();
-                    i++;
+                    char[] pair = x.toCharArray();
+                    //Check, if Plugs are in alphabet
+                    if(pair[0]<65 || pair[1]<65 || pair[0]>90 || pair[1]>90) throw new InvalidPlugboardConfigurationFormatException("Error parsing plugs! Maybe you entered a number or a special character?");
+                    else
+                    {
+                        //add it to the array
+                        plugs[i] = pair;
+                        i++;
+                    }
                 }
             }
             return plugs;
diff --git a/de.vanitasvitae.enigmAndroid.txt b/de.vanitasvitae.enigmAndroid.txt
index 95cccf9..8899aa5 100644
--- a/de.vanitasvitae.enigmAndroid.txt
+++ b/de.vanitasvitae.enigmAndroid.txt
@@ -19,9 +19,10 @@ Features:
 	* Working plugboard
 
 More Information about the historical Enigma can be found on Wikipedia.org
+(I recommend the german article, since it is very detailed.)
 .
 
 Repo Type: git
-Build:0.1.1-18.02.2015-beta,6
+Build:0.1.1-23.02.2015-beta,7
 Auto Update Mode:None
 Update Check Mode:None