fixed cyclic dependency issue
Merge pull request #2 from jhaynie/master

fixed cyclic dependency issue