added support for quoted arguments and two builtin-commands