small code simplification
Merge branch 'origin/master'