v0.2.0

Circular dependency error, better testing