Yoni's second changes
Merge pull request #15 from ybinstock/master

Yoni's second changes