merge commit
improved loading animation logic