#30 midway commit for fixing cli arguments