Merge pull request #15 from farleir/gh-pages

Final
Merge pull request #16 from farleir/master

Merge pull request #15 from farleir/gh-pages