Merge branch 'develop/cuda'
Merge branch 'develop/cuda'
 Temporary
Fixed a bug in code