Interim update for #846.
Incorped generic content for #846.
Merge pull request #857 from WalterHub/mymaster

Interim update for #846.