Grammar changes

Simplifying the grammar
Fixed merges from fernando
Merge pull request #1 from jjperezaguinaga/fernando-fixes

Fernando fixes
Merge pull request #3 from fernandort/master

Simplifying the grammar