Semi-fixed grammar with fewer conflicts

Fixed #3
Merge pull request #5 from Vandenn/master

Semi-fixed grammar with fewer conflicts