Fix dependency cycle
Merge pull request #1 from pmaachen/1.1.5/gh_fork

Fix dependency cycle