Fixed progress bar and initialization for #10 fix
Merge branch 'master' into benchmark