Dev

Here is the new version : 
 - refactoring
 - unit test