Merge pull request #20 from farleir/gh-pages

Crineu changes
Merge pull request #21 from farleir/master

Merge pull request #20 from farleir/gh-pages