- forked from sgt7 repo and merged new cm commits