Merge pull request #1 from asvitenkov/svet

Svet
Refactor
Merge
Refactoring
Revert and fix.
Refactor
Add input dialog
megre from origin branch
add input dialog