commit  2 for etay
Merge remote-tracking branch 'origin/master'