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