Merge pull request #1 from dawsondiaz/master

Pull Request
Merge pull request #2 from dawsondiaz/gh-pages

Merge from dawsondiaz/master