update
Merge https://github.com/zhangyuchi/cpptestzj