Removed gherkin hack and updated gherkin version