Merge pull request #18 from WebRuin/gh-pages

y
Merge pull request #19 from WebRuin/master

Merge pull request #18 from WebRuin/gh-pages