Revert "Merge pull request #32 from Orange-OpenSource/master"

This reverts commit 5abe6d12540ecf3fee6813d6545a4a077c6a4a3c, reversing
changes made to d5b4b977e515c51f23c6853107b03b6cd5ee53c2.