Merge pull request #1 from kerrinrin/master

Website update
Merge pull request #2 from kerrinrin/gh-pages

Merge pull request #1 from kerrinrin/master