first commit
Merge https://github.com/zliangjiang/liuyan