Minor adjustments
Merge origin/master