doc
Merge pull request #25 from terrywbrady/master

doc