fix
Merge branch 'master' of https://github.com/pachocho84/CM2
a bunch of things