Merge pull request #888 from climbalima/master