Fix loading state problem
Merge pull request #17 from DeOb/master

Fix