2014-04-16
Merge https://github.com/shui8023/code
2014-04-16