big fix for the node_type and argument_type
Merge remote-tracking branch 'origin/master'