Merge pull request #1 from Vandenn/master

Merge pull request #1 from yaojohnpaul/master
Updated Flex file. New Issue #2

Fixed flex file to match CFG. Create modified cup to fix this issue. (to
fix issue, in next commit, add "fixed_#issueno", replace underscore with
space)
Merge pull request #2 from Vandenn/master

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

Adjusted CUP to updated Flex file