Some informations have been added
-r has been added as option