Updated CUP

Based on Conyo++ v2
Merge pull request #3 from yaojohnpaul/master

Updated CUP