type checking placed back and put into right area
Merge branch 'master' of https://github.com/MisterStabbeh/CARE-DB