add loading animation
merge master