Merge pull request #336 from vlidholt/nodeimprovements

Nodeimprovements