Merge pull request #26 from WebRuin/gh-pages

r
Merge pull request #28 from WebRuin/master

Merge pull request #26 from WebRuin/gh-pages