Fix and updates
Fix and updates
Merge remote-tracking branch 'origin/master'