Avoids circular dependencies
Merge remote-tracking branch 'upstream/3.0' into dev
Converted spaces to tabs (indentation)
Merge pull request #44 from domu1de/dev

Prevent circular dependencies