Merge pull request #2 from jeffmcmahan/dev

HTML doc change.
Merge pull request #3 from jeffmcmahan/master

Merge pull request #2 from jeffmcmahan/dev