Fixed issue #16
Setting progress to 0 after indeterminate progress cause unexpected results
Merge remote-tracking branch 'upstream/dev' into dev