new features
Merge branch 'develop/cuda'
Merge remote-tracking branch 'origin/master'
Adding new features