for coscup

for coscup
Merge branch 'master' into gh-pages