Applied revisions from Greg
Merge pull request #4 from zhelu/gh-pages

Applied revisions from Greg