Last update before final version : code cleaned up and bug corrected
Last update before final version : code cleaned up and bug corrected