fixed loading bug
Merge pull request #30 from EnderShadow/master

fixed loading bug