Merge pull request #1 from jlord/gh-pages

mary changes