Merge pull request #1 from toshikurauchi/master

Not setting compute_device_type to None when setting to CUDA fails
Merge branch 'master', remote-tracking branch 'upstream/master'
Adding flag to disable CUDA to the render call