split mark_node function into four
Merge remote-tracking branch 'origin/master'