Merge pull request #15 from farleir/gh-pages

Final