Changed some comparisons to None to address numpy's FutureWarning which would eventually break the code if unaddressed
Merge pull request #85 from rgerkin/master

Changed some comparisons to None to address numpy's FutureWarning.