some changes on my shitty Win machine
merge