added code initialization partie
 merge pull with master