Committing stuff
Merge branch 'full_cuda' of https://github.com/Drin/spam into full_cuda