Merge pull request #1 from ixdiego/master

merge to gh-pages