diff --git a/assembler-8608.lua b/assembler-8608.lua
index 2d68691..f8294c3 100644
--- a/assembler-8608.lua
+++ b/assembler-8608.lua
@@ -20,11 +20,13 @@ end
 local function decodeNumber(n)
 	n = trim(n)
 	local sign = 1; if n:sub(1, 1)=="-" then sign = -1; n = n:sub(2, #n); end;
-	if     n:sub(1, 1)=="$"   then return sign*(tonumber(n:sub(2, #n  ), 16) or error("invalid number "..n)), math.ceil((#n-1)/2)
-	elseif n:sub(1, 2)=="0x"  then return sign*(tonumber(n:sub(3, #n  ), 16) or error("invalid number "..n)), math.ceil((#n-2)/2)
-	elseif n:sub(#n, #n)=="h" then return sign*(tonumber(n:sub(1, #n-1), 16) or error("invalid number "..n)), math.ceil((#n-1)/2)
+	if     n:sub(1, 1)=="$"   then return sign*(tonumber(n:sub(2, #n  ), 16) or error("invalid hex number "..n)), math.ceil((#n-1)/2)
+	elseif n:sub(1, 2)=="0x"  then return sign*(tonumber(n:sub(3, #n  ), 16) or error("invalid hex number "..n)), math.ceil((#n-2)/2)
+	elseif n:sub(#n, #n)=="h" then return sign*(tonumber(n:sub(1, #n-1), 16) or error("invalid hex number "..n)), math.ceil((#n-1)/2)
+	elseif n:sub(1, 2)=="0b"  then return sign*(tonumber(n:sub(3, #n  ),  2) or error("invalid binary number "..n)), math.ceil((#n-2)/8)
+	elseif n:sub(#n, #n)=="b" then return sign*(tonumber(n:sub(1, #n-1),  2) or error("invalid binary number "..n)), math.ceil((#n-1)/8)
 	else
-		local v = sign*(tonumber(n) or error("invalid number "..n))
+		local v = sign*(tonumber(n) or error("invalid decimal number "..n))
 		if v>=-128 and v<=255 then return v, 1
 		elseif v>=-32768 and v<=65535 then return v, 2
 		else error("out-of-range number "..v) end
@@ -56,7 +58,9 @@ local function mnemFromLine(line, instrs, validWords)
 	mnem = mnem:gsub("([%*%+])", " %1 ")
 	mnem = mnem:gsub(" %-?%$[0-9a-fA-F]+ "       , function(n)                                 return addNum  (n)     end)
 	mnem = mnem:gsub(" %-?0x[0-9a-fA-F]+ "       , function(n)                                 return addNum  (n)     end)
+	mnem = mnem:gsub(" %-?0b[01]+ "              , function(n)                                 return addNum  (n)     end)
 	mnem = mnem:gsub(" %-?[0-9a-fA-F]+h "        , function(n) if not validWords[trim(n)] then return addNum  (n) end end)
+	mnem = mnem:gsub(" %-?[01]+b "               , function(n) if not validWords[trim(n)] then return addNum  (n) end end)
 	mnem = mnem:gsub(" %-?[0-9]+ "               , function(n) if not validWords[trim(n)] then return addNum  (n) end end)
 	mnem = mnem:gsub(" [a-zA-Z_][a-zA-Z0-9_%.]* ", function(n) if not validWords[trim(n)] then return addLabel(n) end end)
 	mnem = trim(mnem):gsub(" +", " "):lower()