loading changes
Merge branch 'master' of https://github.com/charliejl28/polly
loading fixes