remove circular dependencies
Merge pull request #1 from doy/master

remove circular dependencies