Merge pull request #29 from WebRuin/gh-pages

e
Merge pull request #30 from WebRuin/master

Merge pull request #29 from WebRuin/gh-pages