Merge pull request #1 from AmauryEsparza/master

Make the pull request
Background
Merge branch 'develop'
Fixing conflicts