Fix loading logic
Merge pull request #35 from daydayfree/dev

Fix loading logic