Added a new version number system and fixed the numbering (Final one!)