Commit merge
Merge origin/master
Minor fixes