Dependency Fixes
Merge pull request #1 from adamsimp/dev

Dependency Fixes