Merge pull request #7 from WebRuin/master

Merge pull request #6 from WebRuin/gh-pages
Merge pull request #8 from WebRuin/gh-pages

Merge pull request #7 from WebRuin/master