Minor optimizations to CPU platform
Merge pull request #228 from peastman/master

Minor optimizations to CPU platform