Fixed Python 2.6 failure
Added workaround for Numpy < 1.7