Merge pull request #412 from alex/version-consistency

Compute the version in the same way as setup.py does