small tidy up
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/Valtech-NAS/Beta
Completed unit tests for loader and tidy up.