Fixed mem leak
Added missing joints support