Simpler NumPy code.
Merge branch 'release'