Avoid circular dependencies
Merge pull request #1 from ceshine/master

Avoid circular dependencies