Merge pull request #1 from mxabierto/gh-pages

Update from mxabierto
Add Thiago, fix Marcelo.
Merge pull request #21 from lxbarth/gh-pages

Add Thiago, update Marcelo (AR->CL)