Revert "Merge pull request #14 from vlatkokaplan/branch3"

This reverts commit 387c4e4b2edb7acb31c610de89bc9b6d5dd051c4, reversing
changes made to ce1d31eb58e7c917260953cfff5ab7b053ad614f.