ASDF
Fix conflixt
Merge branch 'master' of https://github.com/ArjanBroos/CUDAPT
Merge branch 'master' of https://github.com/ArjanBroos/CUDAPT
Add Builder and Pickers