Merge pull request #1 from ChaoticWEG/gh-pages

update
Merge pull request #2 from ChaoticWEG/master

Merge pull request #1 from ChaoticWEG/gh-pages