Merge pull request #829 from njh/cpu_state