Merge pull request #1 from Vandenn/master

Merge pull request #1 from yaojohnpaul/master
Merge pull request #2 from Vandenn/master

Merge
Adjusted CUP to updated Flex file
Merge pull request #2 from yaojohnpaul/master

Adjusted CUP to updated Flex file