Merge pull request #2 from scf32/doc-update

Merged doc update
Merge pull request #3 from scf32/master

Merge pull request #2 from scf32/doc-update