Brnch2

Merge files 1,2,3 to master