Revert "Merge pull request #4 from mbarzeev/master"

This reverts commit 8f5640d23f5159af8cfb2f0fb8fdcee46797a306, reversing
changes made to d80568d4976e5b51b8f6ba234b209eb375a456ef.

Reverting the pull-request from master