fix
Merge pull request #23 from SGover/shahar

fix
Merge pull request #24 from SGover/master

fix