Merge pull request #18 from CPI4Admin/Yoann

Yoann
Merge pull request #21 from CPI4Admin/RomanLOGVINOV

Roman logvinov
Merge pull request #23 from CPI4Admin/master

Roman