Updated CUP

Based on Conyo++ v2