Fixed circular dependency issue
Merge pull request #16 from COMMOLOGIC/master

Fixed circular dependency issue