Adding new tool. Fixes #526