Fix circular dependency.
Merge pull request #19 from DirtyHairy/master

Fix circular dependency.