improved user input handling

Merged Sergey Karataev requested to merge feature/correct into master

Merge request reports