diff --git a/aprs_in.py b/aprs_in.py
index bb8d56dc..fc5f9bb2 100644
--- a/aprs_in.py
+++ b/aprs_in.py
@@ -1,20 +1,44 @@
 import sys
 from os import system
 
-for line in sys.stdin:
-	if '^c' == line.rstrip():
-		break
-#	print(line)
-	if (line.find("MODE=a")) > 0:
-		system("echo 'APRS Mode!!'")
-		mode = 'a'
-		change_mode = True
-	if (line.find("MODE=f")) > 0:
-		system("echo 'FSK Mode!!'")
-	if (line.find("MODE=b")) > 0:
-		system("echo 'BPSK Mode!!'")
-	if (line.find("MODE=s")) > 0:
-		system("echo 'SSTV Mode!!'")
-	if (line.find("MODE=m")) > 0:
-		system("echo 'CW Mode!!'")
-print("Done")
+if __name__ == "__main__":
+
+	change_mode = False
+	if (len(sys.argv)) > 1:
+#        	print("There are arguments!")
+		if (('d' == sys.argv[1]):
+			debug_mode = 1
+	try:
+		for line in sys.stdin:
+			if (debug_mode):
+				print(line)
+				
+#			if '^c' == line.rstrip():
+#				break
+	
+			if (line.find("MODE=a")) > 0:
+				system("echo 'APRS Mode!!'")
+				mode = 'a'
+				change_mode = True
+			if (line.find("MODE=f")) > 0:
+				system("echo 'FSK Mode!!'")
+				mode = 'f'
+				change_mode = True
+			if (line.find("MODE=b")) > 0:
+				system("echo 'BPSK Mode!!'")
+				mode = 'b'
+				change_mode = True
+			if (line.find("MODE=s")) > 0:
+				system("echo 'SSTV Mode!!'")
+				mode = 's'
+				change_mode = True
+			if (line.find("MODE=m")) > 0:
+				system("echo 'CW Mode!!'")
+				mode = 'm'
+				change_mode = True
+			if (debug_mode == True)  and (change_mode == True):
+				print("/home/pi/CubeSatSim/config -" + mode)
+				system("/home/pi/CubeSatSim/config -" + mode)
+				change_mode = False
+	except:	
+		print("Done")