Improve versioning and bump version number