fix deprecated method (getDescendants)
Merge remote-tracking branch 'origin/master'