Merge pull request #1436 from andytaylor/master

doc updates
minor doc updates
Merge pull request #1439 from gaohoward/docs-update-master

minor doc updates
example fixes