make windows work
merge
prepare point release