Merge pull request #13 from RaymanFX/cm-12.0

import new commits raymanfx