submitted for publishing on May 8
Merge pull request #1264 from WalterHub/mymaster

submitted for publishing on May 8