fixed k1 and cpu
Merge branch 'master' of https://github.com/ultralaserdeluxe/roej