refactor doc
resolve conflicts
add doc, fix issue
Merge pull request #642 from jialinsun/master

add doc, fix issue