Merge branch 'refs/heads/windows'
Update README
Merge branch 'refs/heads/windows'
Update README
Fix a bug on windows