submitted for publishing on May 15
Merge pull request #1288 from WalterHub/mymaster

submitted for publishing on May 15