Merge branch 'master' into ui
fixed script that was lost during conflict
Merge branch 'ui'