Merge pull request #1 from photoxor/master

Master -> gh-pages