Now allow for optional installed dependencies
Merge branch 'develop'