fixed warnings
Merge branch 'origin/master'