Fixed MinGW compiling
Fixed MinGW compiling (2)
Modified .gitignore
Little change
Merge remote-tracking branch 'upstream/master' into development