submitted for publishing on May 21
Merge pull request #1314 from WalterHub/mymaster

submitted for publishing on May 21