code merge
merge with windows code Merge branch 'master' of https://github.com/soliton4/nodeMirror