Start on glass
Merge branch 'master' of https://github.com/ArjanBroos/CUDAPT
Merge
Fix conflict
Merge branch 'master' of https://github.com/ArjanBroos/CUDAPT