moving toward pull #1179
Merge pull request #1524 from WalterBright/22

moving toward pull #1179