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

yoni's fifth changes