doc
Merge pull request #26 from terrywbrady/master

doc