Closes #35
Merge pull request #41 from mozillavenezuela/master

Closes #35