Tightened up code per github suggestions.
Merge branch 'master' of https://github.com/mttp/numpy