Updated CC popup trigger

Close #105
Merge branch 'develop'