Update with master
Remove trailing whitespace