Correct dependency ordering
Merge pull request #1 from lattwood/master

Correct dependency ordering