Update loading to conform with Loader scheme
Merge pull request #64 from ninjadev/loading

Update loading to conform with Loader scheme