Merge pull request #499 from pyr/feature-cpu-active