Merge pull request #2 from ruiafonsopereira/gh-pages

Merge with gh-pages
Merge pull request #3 from ruiafonsopereira/master

Merge pull request #2 from ruiafonsopereira/gh-pages