removed np.nanmean from computations that only need np.mean
Merge branch 'develop'