Fix - Issue 20

This should hopefully resolve issue #20. 

I've rearranged Node.cpp a little to group all the same class functions together, so most of the changes there are in regards to that.