Revert "Merge pull request #214 from MeirKriheli/develop"

This reverts commit 1682de061f4e6bae3ae81f9902d6eec9c1f8011d, reversing
changes made to 0b7f4839ee1d29972252b0d3536b29466a373afb.