General Cleanup
Merge pull request #3 from deadman96385/cm-11.0

General Cleanup