Some small path corrections, add tools updates (#2)
Merge remote-tracking branch 'origin/master'