#109 added loading indication