Merge pull request #1031 from ionum/master