Initial part
2nd version
Merge origin/master