MCOP: Minor Customizations
Merge pull request #921 from michaelhowden/master

MCOP: Minor Customizations