Fix circular imports, issue #108