Prevent cyclic dependencies
Merge pull request #12 from mrjoelkemp/cyclic

Prevent cyclic dependencies