Don't remove first word for when command type defaults to add
Merge branch 'wd-parser'