Merge pull request #1 from SK83RJOSH/master

Master
Merge pull request #2 from SK83RJOSH/gh-pages

Merge pull request #1 from SK83RJOSH/master