Xuaps team
Merge pull request #587 from dvilchez/master

Xuaps team