Merge pull request #39 from mozillavenezuela/master

Closing issue #14