Small structural changes
Merge branch 'master' into martyn82