yoni's changes
Merge pull request #1 from ybinstock/master

yoni's changes