Merge pull request #15 from WebRuin/gh-pages

fg
Merge pull request #16 from WebRuin/master

Merge pull request #15 from WebRuin/gh-pages