Handle multiple parents properly
check that multi parented features are working
Merge branch 'release/alpha-0.02'