added detection of node name
refactored to boostrap from github