Fixed progress bar
Merge branch 'master' into apj