Code

Merge GSoC 2009 node tool rewrite