Updated main calls
Updated alot of stuff
Merge branch 'master' of https://github.com/jhallard/3DLocalization