fixes #33
Merge branch 'master' of https://github.com/nexpy/nexpy