Fix virtual destructor
Merge branch 'fix_virtual_destructor' into develop