Added OpenCL
Merge pull request #2484 from kbenzie/master

Added OpenCL