Support lower case
Merge branch 'wd-parser'