Re: CMD - implement more robust parser