little changes
Merge origin/master
edit echo to native HTML