Corrected wrongly merged branch + added loadingDialog