fixes #148
Merge branch 'master' of github.com:pynbody/pynbody
Merge remote-tracking branch 'upstream/master'