Add loader
Testing loader ok
Small update
Merge branch 'master' into jhow-dev
Merge branch 'jhow-dev'