bugfix: fixing dependency cycle
Merge pull request #28 from kreczko/fixing-dependency-cycle

bugfix: fixing dependency cycle