update
Merge pull request #7 from joshualande/gh-pages

update