part of 6-0
Merge branch 'master' of github.com:yfu/acpp