Minor optimization
Merge branch 'origin/master'