Merge pull request #993 from italohdc/master