added progress bar
disabled certain indicators
Merge remote-tracking branch 'upstream/master'
fixes
Merge pull request #292 from jpecht/master

fixes