Versions

Finally, a PR to rule them all.

Contains #134 and #141, fix the versions, fix the tests and have a correct git history :)