Branch choose_tools - commit 3

1. Bug fix.