code cleanning
converted pointers to references
a slight change in node
Merge branch 'vdev' into develop
Merge branch 'sdev' into develop