Merge pull request #1 from johan9305/master

Mejora de formula
Merge pull request #3 from buckdanny/master

Merge pull request #1 from johan9305/master