Merge pull request #2 from brucellino/gh-pages

updating to master branch instead of gh-pages,
Merge pull request #3 from brucellino/master

Merge pull request #2 from brucellino/gh-pages