Merge pull request #891 from narfbg/develop-core-loader

Improve the core Loader library