checking out branching
Merge pull request #1 from urielurano/master

Merging with Uriel.