Merge pull request #1 from benny214/master

Master
Merge pull request #2 from benny214/gh-pages

Merge pull request #1 from benny214/master