Merge pull request #3 from Vandenn/master

Merge
Merge pull request #4 from Vandenn/master

Small updates. Issue #3
Merge pull request #5 from Vandenn/master

Semi-fixed grammar with fewer conflicts
Fixed Shift/Reduce conflict

Positive and negative increments
Merge pull request #5 from yaojohnpaul/master

Fixed Shift/Reduce conflict