Finish 2.3
Fix segmentation fault on Windows
Revert "Fix segmentation fault on Windows"

This reverts commit 205717284db9b1d0c40adde3dca49ca53502ddcc.
Fix segmentation fault on Windows
Bump version to 2.3.1
Finish 2.3.1