Add a percentage completion counter (Fixes #48)
Merge remote-tracking branch 'upstream/master'