Initial Parent Commit (Place holder)
Merge upstream master into dev
Added node_test
Merge branch 'dev'