Merge pull request #8 from exsanguinator/gh-pages

merge content complete
Merge branch 'master' into gh-pages