merging with master, normalizing version number