Merge pull request #3 from sunnyYanan/yanan

yn:node setting complete and bug modification
Merge remote-tracking branch 'origin/master' into yanan