Updates from .20 ROM
Merge pull request #26 from loganmc10/cm-10.1

Updates from .20 ROM