Modify some things with hopefully fixes
Merge pull request #15 from Team-Exhibit/cm-10.2

Modify some things with hopefully fixes