Cross laptop changes
Merge branch 'master' of https://github.com/NickCharsley/ShowManager