Merge branch 'master' of https://github.com/beppeshot/ccc.git