Updated with most recent dependencies
Merge branch 'develop'