diff --git a/Emulator.py b/Emulator.py
index 9d04762..61bccf3 100644
--- a/Emulator.py
+++ b/Emulator.py
@@ -62,7 +62,7 @@ class Emulator:
 			self.changes[reg] = val
 
 	def processSourceLine(self, line_text, index):
-		tokens = re.findall(r'[\w%:$#]+', line_text)
+		tokens = re.findall(r'[^\s,]+', line_text)
 		if len(tokens) <= 0:
 			return index
 		if tokens[0][-1] == ':':