Added comments & make version integration