add new feature
add by orain.xiong
add by orain.xiong
add new by xiong too
add new xu too
fix conficts
change again by xu
Merge branch 'version3' of github.com:orainxiong/oraintest into version3
add by x
add by xiong
xiong fix conficts
add by xiong
add by xu
fix bug