Minor changes
Merge origin/master