Merge pull request #2 from amit1618/amit

Yosi comments implemented
Merge pull request #3 from amit1618/master

Merge pull request #2 from amit1618/amit