Incorped some changes / properties for #846.
Merge pull request #862 from WalterHub/mymaster

Incorped some changes / properties for #846.