Added nodes are selected more carefully
Merge pull request #314 from khandelwal/fixdiffs

Diffs: Added nodes are selected more carefully