Merge pull request #344 from pelayogmp/master Former-commit-id: 8c3172740345b3a73b316dd1c5f78648111af0ed