fixed circular import
Merge pull request #1447 from naylor-b/circular_import

fixed circular import