#243 Solved bug, added loading mask