doc
Merge pull request #3 from 1169306/master

doc