Finishing first version
Cleaning files and adding a last modification
Fixing one small bug