diff --git a/Taschenrechner/Main.cpp b/Taschenrechner/Main.cpp
index 1b9fd41..80f6256 100644
--- a/Taschenrechner/Main.cpp
+++ b/Taschenrechner/Main.cpp
@@ -53,7 +53,7 @@ double parseFloat(String inputString) {
 	double floatValue = 0.0;
 	int currentPosition = 0;
 	for (; currentPosition < inputString.length; currentPosition++) {
-		if (inputString[currentPosition] == '.') {
+		if (inputString[currentPosition] == '.' || inputString[currentPosition] == ',' ) {
 			currentPosition++;
 			break;
 		}
@@ -86,7 +86,7 @@ Token getNextToken(String &inputString) {
 			advance(inputString);
 		}
 
-		if (inputString[0] == '.') {
+		if (inputString[0] == '.' || inputString[0] == ',') {
 			token.kind = KOMMA;
 			advance(inputString);
 
diff --git a/Taschenrechner/Taschenrechner.exe b/Taschenrechner/Taschenrechner.exe
new file mode 100644
index 0000000..241b8f9
Binary files /dev/null and b/Taschenrechner/Taschenrechner.exe differ