WoR
Merge branch 'master' of https://github.com/Satsuoni/Brandonscan

merge