cs6 init
Merge branch 'master' of https://github.com/calcus/base