adjust README & code
Merge branch 'docs'