Arreglado
Merge branch 'test'
Version 30/OCT/2014