submitted for publishing on June 19
Merge pull request #1394 from WalterHub/mymaster

submitted for publishing on June 19