Merge pull request #1 from omerjerk/master

sync the changes
Merge pull request #2 from shubhamd/master

Merge pull request #1 from omerjerk/master