added preloader; forgot about it)
Merge remote-tracking branch 'origin/master'