Fixed merge conflicts
Ensure correct dependency loading order
Merge pull request #2 from fairlight1337/master

Fixed loading order of dependencies