Revert "Merge pull request #17 from ichim-david/master"

This reverts commit d9cc7536841ee6ef2c7640dbaaf1294b6bc4fb76, reversing
changes made to e43e0c5a7eedc2dcb1e9f8ec77597cc6396ce534.