Merge pull request #337 from mlindgren/master

Additional documentation update
latest commit 65091e5dc8
@scrooloose scrooloose authored