Merge pull request #33 from g-weatherill/master

Hack to fix Numpy 1.8.1 bug