Merge pull request #2 from ESDet/gh-pages

Merge gh-pages to master
Merge pull request #1 from anderoy/master

Merge pull request #2 from ESDet/gh-pages