add loading and some hotfix
Merge pull request #10 from gorbin/dev

add loading and some hotfix