Merge branch 'master' of https://github.com/alexmu/cls-cc.git