Minor changes
Merge origin/master
Minor changes