Merge pull request #1282 from madrang/MinorChangesOfPull1281