BS tools: Fix for develop and added missing option for argument parser.