Merge pull request #1 from Xuyuanp/dev

Dev
Merge pull request #2 from Xuyuanp/dev

Dev
Merge pull request #3 from Xuyuanp/dev

Dev
fork nerdtree
merge
Merge remote-tracking branch 'origin/master' into dev

* origin/master:
  fork nerdtree