Eyal checkin
Merge pull request #1 from shaqo88/Shaul

shaul branch
Eyal merge