Merge pull request #2 from cru-Luis-Rodriguez/master

pull merge dev from master