docs
Merge pull request #217 from nwin/master

docs