some code  corrections
Merge origin/master