#257 and #259 progressbar
Merge remote-tracking branch 'origin/0.6.0' into 0.6.0