Updated with some question asked by Martin.
Merge pull request #49 from ktf/gh-pages

Updated with some question asked by Martin.