Naive version of the tool + author fix