Fixed circular dependencies
Updated tag
Merge pull request #4 from magnetsystems/fix_circular_dependencies

Fixed circular dependencies