Added support for numpy 1.6