Fix logic
Merge branch 'master' of github.com:rage/info-screen