Merge pull request #1 from omerjerk/master

sync the changes