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

yoni's third changes