Merge pull request #21 from ybinstock/master

yoni's fourth changes
yoni's fifth changes