Merge pull request #29 from SGover/master

upstream
Merge pull request #32 from SGover/shahar

Merge pull request #29 from SGover/master