Merge pull request #24 from ParadiseSS13/master

Merge from Master
Detective Scanner
Odd
Merge pull request #88 from Fox-McCloud/Detective

Detective