Merge pull request #2 from coderdiaz/master

Actualizaciones 27/11/2014
Merge pull request #2 from palomachx/master

Merge pull request #2 from coderdiaz/master