Merge pull request #1211 from br101/master