Merge pull request #2 from jorgegvalencia/master

More changes
New update