code solution sample
Merge origin/master