Merge pull request #1 from CakeTick/master

Update
Merge pull request #2 from CakeTick/gh-pages

Merge pull request #1 from CakeTick/master