update for cm-10.1 forked from evervolv