pull request from Shai

my files