Merge pull request #304 from insertinterestingnamehere/numpy

Numpy