Fixed switching between tools. Code refactoring.
Merge pull request #21 from dmytroshp/Corrections

Fixed switching between tools. Code refactoring.