Omid PR

[Francisco Perez-Sorrosal]

Hi Daniel & Ohad,
I'm integrating the current Omid into Sieve and I need someone to go over this 
PR, could you please take a look at it?
Thanks,
Francisco