fix circular import
Merge pull request #1 from cespivo/master

fix circular import