Changed "==None" to "is None" to avoid compatibility warning issues in
numpy 1.9.1