Make regex a bit more general (allow lack of whitespace before flags)
Bugfix: Binary, not full command