need to merge
Merge pull request #36 from teenHack42/cpu

need to merge