fixes
Merge pull request #1 from Lysergic-Acid/cm-12.0

fixes