update documentation
Merge pull request #139 from macbookandrew/develop

update documentation