correct greater than 100% bug in progress bar
Merge remote-tracking branch 'origin/master'