Detective Tackle and Tweaks
Merge pull request #21 from NarPar/master

Detective Tackle and Tweaks