Merge pull request #2 from mjasher/gh-pages

update master
Merge pull request #3 from mjasher/master

Merge pull request #2 from mjasher/gh-pages