Merge pull request #216 from luismagr/tmp

Tmp