Merge pull request #146 from senquack/gpulib_fix