shufeng modify 2013.11.26
Merge branch 'm_test'