fixing stuff, hopefully not breaking other stuff
Merge branch 'master' of https://github.com/wyattearp/iDectectProject.git