submitted for publishing on 4/4/13
Merge pull request #1078 from WalterHub/mymaster

submitted for publishing on 4/4/13