Merge pull request #78 from dawsondiaz/master

merge
Merge pull request #80 from dawsondiaz/gh-pages

Merge pull request #78 from dawsondiaz/master