solve problem 1
Merge origin/master