Merge node.erl die 2te
Merge branch 'master' of https://github.com/bDino/VS2013-2014
merge die 3te