fix code
add comments
Merge branch 'shuaiwang' into rtong