doc
Merge pull request #32 from terrywbrady/master

doc