minor style change on loader
Merge branch 'master' into OAS-dev