Merge pull request #5 from mxabierto/gh-pages

Merge changes downstream
Add Mayeli.
Merge pull request #126 from lxbarth/gh-pages

Add Mayeli