Merge pull request #298 from ayr0/numpy2

Lab: NumPy II