#86 Added loading indicator