Add bus tool
Merge branch 'master' into subtreeable