Fix syntax error
Fix name error
Merge pull request #10 from bmng-dev/merge

Merge branch merge into Nodes