removed extra spaces
removed trailing spaces
Merge branch 'origin/master'