Add tools
Merge branch 'tools'