update mine screen
Merge remote-tracking branch 'origin/stab' into Nathan