Add a loading delay
Merge branch 'fixes'