Addresses #75 and updates status bar when updating
Merge remote-tracking branch 'origin/master'