Merge pull request #1333 from br101/master