temp
Cleaned the dirty code
Cleaning dirty room
Merge branch 'develop/cuda'