[Matahari] [PATCH] Shell: Add command line options