Change to np.max
actually, should be np.maximum
Merge pull request #156 from larrybradley/fixmax

Change max to np.max