(temp commit to merge upstream)
Merge branch 'master' of github.com:studentkittens/moosecat
Improved status_timer logic