FIX: Small bugs with progress indicator
Merge remote-tracking branch 'upstream/master'