Fix for Handling dependencies
Merge pull request #930