Small updates. Issue #3

this issue is for the unresolved shift/reduce and reduce/reduce
conflicts
Merge pull request #4 from Vandenn/master

Small updates. Issue #3