Merge pull request #1 from photoxor/master

Master -> gh-pages
Merge pull request #2 from photoxor/gh-pages

Merge pull request #1 from photoxor/master