Merge pull request #1002 from ciomaire/master