Fixed compiler warning
Merge branch 'origin/master'