Merge pull request #516 from pyr/feature-normalized-cpu