With Frank suggestions
Merge pull request #2 from beshmuel/gh-pages

With Frank suggestions