fix language in comment and spec-description.
Merge branch 'staging' into 649-refactor_parsing