sabberworm Merge pull request #408 from oliverklee/task/tools-update