Merge pull request from danielmartinezsarta/patch-4 Merge changes in some relationed files.