doc
Merge pull request #29 from terrywbrady/master

doc