Fix windows build
Bump version to 0.9.7a, for Windows fix
Changelog for 0.9.7a
Merge with master