Gherkin

Fixes #1877