Refactoring, and fix some changes
Merge branch 'retif-nestene' into nestene
Update README.md
Fix templates and variables if use ssh con