Revert "Merge pull request #1 from omerwe/master"
Merge pull request #2 from omerwe/revert-1-master

Revert "Merge pull request #1 from omerwe/master"