Merge pull request #44 from efullea/gh-pages

Minor edits. Closes #40 and #42