Merge pull request #1 from kormaco/master

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

Merge pull request #1 from kormaco/master