final issues update #2
Merge remote branch 'origin/master'