Adapt fix for #36 for Numpy 1.6.1 on Python 3