Fix bug so that None does not equal 0.
Merge remote-tracking branch 'rixner/master'