some modification
Merge remote-tracking branch 'progectpong/master1' into master1