Further optimizations to CPU platform
Merge pull request #229 from peastman/master

Further optimizations to CPU platform