Updated to Pyopencl2013