Removed cyclic dependency for #26
Merge pull request #27 from openpowerquality/26

Removed cyclic dependency for #26