Fix 3 for #187
Added node id
Merge pull request #190 from jbreuer/patch-4

Fix 3 for #187