Fixed loading screen bug
Merge remote-tracking branch 'origin/SagieBranch'