Merge pull request #508 from maxgiraldo/2020-02-sp-grammar