Updated versions of tools
Merge branch 'develop'