doc
Merge pull request #2 from 1169306/master

Merge