new branch: tamir, rb:elad
comitted from branch Tamir to master