Update version, ready to merge