Merge pull request #14 from crazzycasper/master

ch
Merge pull request #18 from crazzycasper/gh-pages

Merge pull request #14 from crazzycasper/master