Merged styling
Merge branch 'master' into Step1_finished