Merge pull request #700 from cuda-geek/fix_build_with_cuda