Update core - loader
Merge pull request #39 from Kristories/develop

Update core - loader