Commit Sollace's changes
Merge branch 'master' of https://github.com/Sollace/BlazeLoader