Merge pull request #41 from samatt/develop

Some fixes
camera track
fixed
safer destructor