Cleaned up command line handling
Updated command separator regex

It works for strings greater than one character now.