Merge pull request #14 from SGover/master

Merge pull request #12 from SGover/shahar
Merge pull request #17 from SGover/shahar

Merge pull request #14 from SGover/master