diff --git a/adafruit_pioasm.py b/adafruit_pioasm.py
index cc86192..22bf47b 100644
--- a/adafruit_pioasm.py
+++ b/adafruit_pioasm.py
@@ -12,6 +12,9 @@
 """
 
 import array
+import re
+
+splitter = re.compile(r",\s*|\s+(?:,\s*)?").split
 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_PIOASM.git"
@@ -61,7 +64,7 @@ def assemble(text_program):
     assembled = []
     for instruction in instructions:
         # print(instruction)
-        instruction = instruction.split()
+        instruction = splitter(instruction.strip())
         delay = 0
         if instruction[-1].endswith("]"):  # Delay
             delay = int(instruction[-1].strip("[]"))