Tested version
Removal of all CUDA pointers in main
Merge branch 'master' into paper