Updated dependency logic; Made output more consistent
Merge remote-tracking branch 'origin/develop'