#BH-36 In Progress
Loading indication implemented
Merge remote-tracking branch 'origin/master'