Some small improvements.
Merge origin/master