Fixing CircularDependencyError
Releasing 0.4.18