Fix minor bugs
Minor changes
Merge branch 'master' into develop