Merge pull request #2 from mjasher/gh-pages

update master