submitted for publishing on 3/14/13
Merge pull request #1015 from WalterHub/mymaster

submitted for publishing on 3/14/13